diff --git a/.env.dev b/.env.dev
index 4f5f29fd..93e957d9 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,10 +12,6 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-<<<<<<< HEAD
-# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-=======
 
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
@@ -23,7 +19,6 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
->>>>>>> projects/mes-test
 
 
 # 路由懒加载
diff --git a/src/router/index.js b/src/router/index.js
index 2f8f3770..555a4184 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,16 +73,6 @@ export const constantRoutes = [
     path: '/',
     component: Layout,
     // redirect: 'core/base/factory',
-<<<<<<< HEAD
-    children: [{
-      path: 'index',
-      // redirect: 'core/base/factory',
-      component: (resolve) => require(['@/views/index'], resolve),
-      name: '首页',
-      meta: { title: '首页', icon: 'dashboard', affix: true }
-    }
-    ]
-=======
     // children: [{
     //   path: 'index',
     //   redirect: 'core/base/factory',
@@ -91,7 +81,6 @@ export const constantRoutes = [
     //   meta: { title: '首页', icon: 'dashboard', affix: true }
     // }
     // ]
->>>>>>> projects/mes-test
   },
   {
     path: '/user',