diff --git a/src/views/abnormalAlarm/emailMonitor/overview/index.vue b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
index 9ae3205..d0dcf62 100644
--- a/src/views/abnormalAlarm/emailMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
@@ -205,18 +205,12 @@ const columns = [
       customRender: 'status'
     }
   },{
-<<<<<<< Updated upstream
     title: 'ENABLE',
     align: 'left',
     dataIndex: 'enabled',
     scopedSlots: {
       customRender: 'enabled'
     }
-=======
-    title: 'ENABLE OR NOT',
-    align: 'center',
-    dataIndex: 'enabled'
->>>>>>> Stashed changes
   },{
     title: 'E-MAIL',
     align: 'center',