diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue
index ac766d01..a1e36049 100644
--- a/src/components/ActionBar/index.vue
+++ b/src/components/ActionBar/index.vue
@@ -131,17 +131,7 @@
             }
             id = ids[index + 1]
           }
-<<<<<<< HEAD
-          closePage()
-          go({
-            path: route.path,
-            query: {
-              id,
-            },
-          })
-=======
           closePage(route.path + '?id=' + id)
->>>>>>> 98e811704e6901ae61f0123993cfa1d3a82e36b6
         } else {
           createMessage.warning('列表页面数据丢失，请回退列表页面后重试！')
         }
diff --git a/src/design/iconfont.less b/src/design/iconfont.less
index 0663ad5f..daebd273 100644
--- a/src/design/iconfont.less
+++ b/src/design/iconfont.less
@@ -1,15 +1,14 @@
-.icon-locksuo, .icon-duihao1 {
+.icon-locksuo,
+.icon-duihao1 {
   color: #17a6a3;
 }
-.icon-lock-openkaisuo, .icon-chahao {
+.icon-lock-openkaisuo,
+.icon-chahao {
   color: @msg-color;
 }
-<<<<<<< HEAD
 .IconColor {
   color: #257afa !important;
 }
-=======
 .icon-bingtu3 {
   color: #257afa;
 }
->>>>>>> 98e811704e6901ae61f0123993cfa1d3a82e36b6