diff --git a/.github/workflows/publish-theme.yml b/.github/workflows/publish-theme.yml
index 1b58a46..3b2c0c9 100644
--- a/.github/workflows/publish-theme.yml
+++ b/.github/workflows/publish-theme.yml
@@ -28,11 +28,7 @@ jobs:
           cp ./README_zh-CN.md ./packages/vitepress-theme-async
           cp ./README.md ./packages/vitepress-theme-async
           node ./scripts/publish.mjs
-<<<<<<< HEAD
-          node ./scripts/sites-check.mjs 
-=======
 					node ./scripts/sites-check.mjs 
->>>>>>> dev
           yarn config:build
           zip -r vitepress-theme-async ./packages/vitepress-theme-async
         env: