diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index d0389ff..080fc2e 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -552,16 +552,10 @@
             icon: "el-icon-circle-plus-outline",
             event: "create",
             show: true,
-<<<<<<< HEAD
-            has: "m11-2-1",
-          },
-        ],
-=======
             disabled: true,
             has: "m11-2-1"
           }
         ]
->>>>>>> 2c47e4cb5413ffe2f32eef2e245a7ed2c2641131
       },
       //站点表格相关
       siteTableInfo: {