diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c1b5ae13..7bcfc30b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-<<<<<<< HEAD
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
+
       with:
         fetch-depth: 0
 
@@ -20,9 +20,6 @@ jobs:
         git config user.name github-actions
         git config user.email github-actions@github.com
 
-=======
-    - uses: actions/checkout@v5
->>>>>>> 85e8401 (v6.4.0...v6.5.1)
     - uses: actions/setup-node@v4
       with:
         node-version: 20