diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index 57821b8..6bf1149 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1494,10 +1494,6 @@ export default defineComponent({
         });
       }
       if(a.length==0){
-<<<<<<< HEAD
-=======
-        console.log(123)
->>>>>>> b2f88140799e0867e7ee99aaa09fe88f841aa673
         test_monitor_list.value.forEach((ele) => {
           ele.isHide = false;
         })