diff --git a/package.json b/package.json
index 34f9713..aa970db 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.9.0",
-<<<<<<< HEAD
   "description": "博诺思公共微服务平台",
   "author": "博诺思",
-=======
-  "description": "公共服务平台",
-  "author": "bonus",
->>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
diff --git a/vue.config.js b/vue.config.js
index 2ae8406..c7e3968 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,15 +7,11 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-<<<<<<< HEAD
+
 const name = process.env.VUE_APP_TITLE || '博诺思公共微服务平台' // 网页标题
 
 const baseUrl = 'http://192.168.0.38:58080' // 后端接口
-=======
-const name = process.env.VUE_APP_TITLE || '公共服务平台' // 网页标题
 
-const baseUrl = 'http://localhost:58080' // 后端接口
->>>>>>> 8bd21926c835e55a8bb041e202098e441d9398f4
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口