diff --git a/dbm-ui/frontend/lib/bk-icon/style.css b/dbm-ui/frontend/lib/bk-icon/style.css
index 96294239a4..4983c17784 100644
--- a/dbm-ui/frontend/lib/bk-icon/style.css
+++ b/dbm-ui/frontend/lib/bk-icon/style.css
@@ -635,12 +635,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .db-icon-daoru:before {
 	content: "\e1ef";
 }
-<<<<<<< HEAD
 .db-icon-piliangluru:before {
 	content: "\e1f1";
 }
 .db-icon-cluster-standardize:before {
 	content: "\e1f9";
 }
-=======
->>>>>>> 3155ff4ed (feat(frontend): sqlserver 工具箱 #3485)
diff --git a/dbm-ui/frontend/src/styles/common.less b/dbm-ui/frontend/src/styles/common.less
index d87ea456cc..639cb2edf5 100644
--- a/dbm-ui/frontend/src/styles/common.less
+++ b/dbm-ui/frontend/src/styles/common.less
@@ -642,7 +642,7 @@
   width: 4px !important;
   height: 4px !important;
 }
-// 处理tag粘在一起的问题
+
 .bk-tag {
   margin-right: 4px;
 }