diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json
index c4c312f98..81c9bc471 100644
--- a/packages/plugin-designer/package.json
+++ b/packages/plugin-designer/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@ali/lowcode-plugin-designer",
-<<<<<<< HEAD
   "version": "0.8.3",
-=======
-  "version": "0.8.1",
->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
   "description": "alibaba lowcode editor designer plugin",
   "files": [
     "es",