diff --git a/src/views/app/Home.vue b/src/views/app/Home.vue
index 8761edbdb..9f0b42723 100644
--- a/src/views/app/Home.vue
+++ b/src/views/app/Home.vue
@@ -25,36 +25,18 @@
           <li><router-link to="/customer/customerList">客户管理</router-link></li>
           <li><router-link to="/my/UserIncome">收入</router-link></li>
           <li><router-link to="/serve/list">保单列表</router-link></li>
-<<<<<<< HEAD
           <li><router-link to="/agentEenter/agentEenterBasicInfor">自助入司</router-link></li>
-          <li><router-link to="/nbs/list">nbs列表</router-link></li>
           <li><router-link to="/agentEenter/approve/ApproveList">入司审批列表</router-link></li>
           <li><router-link to="/survey/surveyList">问卷调查</router-link></li>
           <li><router-link to="/renewalManage/list">续期管理列表</router-link></li>
           <li><router-link to="/nbs/list">nbs列表</router-link></li>
           <li><router-link to="/nbs/internal">nb内勤</router-link></li>
-          <li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=BB">保全-搜索-联系方式变更</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=BC">保全-搜索-受益人变更</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=PC">保全-搜索-续期账户变更</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=CT">保全-搜索-退保</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹豫期退保</router-link></li>
-          <!-- <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹退</router-link></li> -->
-          <li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li>
-=======
-          <!-- <li><router-link to="/agentEenter/agentEenterBasicInfor">自助入司</router-link></li> -->
-          <!-- <li><router-link to="/nbs/list">nbs列表</router-link></li> -->
-          <!-- <li><router-link to="/agentEenter/approve/ApproveList">入司审批列表</router-link></li> -->
-          <!-- <li><router-link to="/survey/surveyList">问卷调查</router-link></li> -->
-          <!-- <li><router-link to="/renewalManage/list">续期管理列表</router-link></li> -->
->>>>>>> 302be13bed418cca61334d53767c756ffcd2f461
-          <li><router-link to="/preserve/common/search?entry=BB">保全-搜索-联系方式变更</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=BC">保全-搜索-受益人变更</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=PC">保全-搜索-续期账户变更</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=CT">保全-搜索-退保</router-link></li>
-          <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹豫期退保</router-link></li>
-          <!-- <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹退</router-link></li> -->
           <!-- <li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li> -->
+          <li><router-link to="/preserve/common/search?entry=BB">保全-搜索-联系方式变更</router-link></li>
+          <li><router-link to="/preserve/common/search?entry=BC">保全-搜索-受益人变更</router-link></li>
+          <li><router-link to="/preserve/common/search?entry=PC">保全-搜索-续期账户变更</router-link></li>
+          <li><router-link to="/preserve/common/search?entry=CT">保全-搜索-退保</router-link></li>
+          <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹豫期退保</router-link></li>
         </ul>
       </li>
       <li class="mt10">