diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cb8c57b..3c19795 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,9 +24,6 @@ jobs:
       - name: npm publish
         run: |
           cd ./cli
-<<<<<<< HEAD
-          npm publish
-=======
           # npm publish -r --tag latest --no-git-checks
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -38,6 +35,4 @@ jobs:
           automatic_release_tag: "latest"
           prerelease: false
           title: "Development Build"
-          
-
->>>>>>> ebd3558f722176eefe86d8327a07c690ed27016f
+