diff --git a/static/css/common.css b/static/css/common.css
index bbf84d7..49be8e8 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -399,125 +399,7 @@ select {
 	font-size:12px;
 }
 .help-inline:hover,.help-block:hover{
-<<<<<<< HEAD
 	color:var(--bs-primary)
-=======
-	color:#000;
-}
-/*form-horizontal-left 样式,靠左侧对其，内部条目浮动排列*/
-
-.form-horizontal-left .form-group {
-	margin-right: 0px;
-	margin-left: 0px;
-}
-.form-horizontal-left .form-group .controls{
-	float:left;
-	display:flex;
-	lex-direction: row;
-	flex-wrap: wrap;
-  align-content: center;
-  justify-content: flex-start;
-	align-items : center;
-}
-@media (max-width: 420px) {
-	.form-horizontal-left .form-group .controls{
-		min-width:250px;
-	}
-}
-.form-horizontal-left .form-group .controls-adapt{
-	float:none;max-width:750px;
-}
-
-@media (max-width: 420px) {
-	.form-horizontal-left .form-group .controls-adapt{
-		min-width:250px;
-		padding-left:0;
-		padding-top:35px;
-	}
-}
-.form-horizontal-left .form-group .controls .form-control{
-	float:none;
-}
-.form-horizontal-left .form-group .controls label{
-	float:none;
-}
-.form-horizontal-left .form-group .controls .radio{
-	float:none;
-	font-weight:normal;
-	margin: 3px;
-	display: flex;
-	f1ex-direction:row;
-	flex-wrap: wrap;
-	align-content: center;
-	justify-content: center;
-  align-items : center;
-
-}
-.form-horizontal-left .form-group .controls .checkbox{
-	float:none;
-	font-weight:normal;
-}
-.form-horizontal-left .form-control{
-	float:left;
-	padding:2px 6px;
-	border-radius: var(--radius);
-}
-.form-horizontal-left .input-group{
-	max-width:250px;
-	
-}
-.form-horizontal-left .input-group>input{
-	width:216px;
-	
-}
-.form-horizontal-left .input-group.seccode-input>input{
-	width:68px;
-}
-.form-horizontal-left  .seccode_type_99 .input-group.seccode-input>input{
-	width:166px;
-}
- .form-horizontal-left .control-label {
-	 float:left;
-  }
-
-.form-horizontal-left .help-inline{
-	float:left;
-	padding:5px 5px 5px 25px;
-	line-height:20px;
-	word-break: break-all;
-}
-.form-horizontal-left ul.help-inline{
-	padding:0 0 0 25px ;
-	word-break: break-all;
-}
-.form-horizontal-left dd .help-block ,.form-horizontal-left dd .help-inline{
-	padding:6px;
-}
-.form-horizontal-left .slider-horizontal{
-	float:left;
-	margin-top:7px;
-	width:250px;
-}
-.form-horizontal-left .tagsinput{
-	float:left;
-	width:250px;
-}
-.form-horizontal-left .help-block{
-	line-height:20px;
-	word-break: break-all;
-	clear:both;
-	padding: 0 15px;
-}
-@media (min-width: 420px) {
-  .form-horizontal-left .control-label {
-  text-align:right;
-	padding-right:10px;
-  }
-  .form-horizontal-left dd .help-block ,.form-horizontal-left dl .help-block ,.form-horizontal-left dd .help-inline,.form-horizontal-left dl .help-inline{
-	padding:6px;
-  }
-	
->>>>>>> ac4102953cafe354ab90296f2836e891661d7d2c
 }
 .nav strong{
 	font-size:14px;