diff --git a/web/package.json b/web/package.json
index f379cf3447d7cdf3b67d7ad6936ad66bbaf217ec..6ac5aa7fb933048790dfa6e175b0e7b72119f491 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
     "name": "gin-vue-admin",
     "version": "2.4.6",
     "private": true,
@@ -11,11 +10,10 @@
         "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
     },
     "dependencies": {
-        "@element-plus/icons": "0.0.11",
         "axios": "^0.19.2",
         "core-js": "^3.6.5",
         "echarts": "4.9.0",
-        "element-plus": "^1.1.0-beta.24",
+        "element-plus": "^1.1.0-beta.8",
         "highlight.js": "^10.6.0",
         "marked": "^2.0.0",
         "mitt": "^3.0.0",
@@ -42,64 +40,14 @@
         "@vue/compiler-sfc": "^3.1.5",
         "babel-eslint": "^10.1.0",
         "babel-plugin-import": "^1.13.3",
+        "chalk": "^4.1.2",
         "dotenv": "^10.0.0",
         "eslint": "^6.7.2",
         "eslint-plugin-vue": "^7.0.0",
         "sass": "^1.26.5",
         "sass-loader": "^8.0.2",
         "vite": "2",
+        "vite-plugin-banner": "^0.1.3",
         "vite-plugin-importer": "^0.2.5"
     }
-}
-=======
-	"name": "gin-vue-admin",
-	"version": "2.3.5",
-	"private": true,
-	"scripts": {
-		"serve": "node openDocument.js && vite --host --mode development",
-		"build": "vite build --mode production",
-		"preview": "vite preview"
-	},
-	"dependencies": {
-		"axios": "^0.19.2",
-		"core-js": "^3.6.5",
-		"echarts": "4.9.0",
-		"element-plus": "^1.1.0-beta.8",
-		"highlight.js": "^10.6.0",
-		"marked": "^2.0.0",
-		"mitt": "^3.0.0",
-		"path": "^0.12.7",
-		"qs": "^6.8.0",
-		"quill": "^1.3.7",
-		"screenfull": "^5.0.2",
-		"script-ext-html-webpack-plugin": "^2.1.4",
-		"spark-md5": "^3.0.1",
-		"vue": "^3.2.0",
-		"vue-particle-line": "^0.1.4",
-		"vue-router": "^4.0.0-0",
-		"vuex": "^4.0.0-0",
-		"vuex-persist": "^2.1.0"
-	},
-	"devDependencies": {
-		"@vitejs/plugin-legacy": "^1.4.4",
-		"@vitejs/plugin-vue": "latest",
-		"@vue/cli-plugin-babel": "~4.5.0",
-		"@vue/cli-plugin-eslint": "~4.5.0",
-		"@vue/cli-plugin-router": "~4.5.0",
-		"@vue/cli-plugin-vuex": "~4.5.0",
-		"@vue/cli-service": "~4.5.0",
-		"@vue/compiler-sfc": "^3.1.5",
-		"babel-eslint": "^10.1.0",
-		"babel-plugin-import": "^1.13.3",
-		"chalk": "^4.1.2",
-		"dotenv": "^10.0.0",
-		"eslint": "^6.7.2",
-		"eslint-plugin-vue": "^7.0.0",
-		"sass": "^1.26.5",
-		"sass-loader": "^8.0.2",
-		"vite": "2",
-		"vite-plugin-banner": "^0.1.3",
-		"vite-plugin-importer": "^0.2.5"
-	}
-}
->>>>>>> origin/seo
+}
\ No newline at end of file