diff --git a/package.json b/package.json
index 29145f6f6..36b100f0f 100644
--- a/package.json
+++ b/package.json
@@ -48,10 +48,6 @@
     "@wecom/jssdk": "^1.3.2",
     "axios": "^1.4.0",
     "clipboard": "^2.0.11",
-<<<<<<< HEAD
-=======
-    "echarts": "^5.4.3",
->>>>>>> v3
     "element-plus": "^2.3.4",
     "font-awesome": "^4.7.0",
     "echarts": "^5.4.3",