diff --git a/src/views/consultant/edit.vue b/src/views/consultant/edit.vue
index aa0187e..7fe7241 100644
--- a/src/views/consultant/edit.vue
+++ b/src/views/consultant/edit.vue
@@ -715,7 +715,6 @@ export default {
           that.explainData = newArray.service_area_text;
           that.Characteristics = res.data.data.expert.keywords.split(",");
           that.addressData = res.data.data.expert.service_area_main.split(",");
-       
 
           that.priceDataLstARR[0]=newArray.price_area_a,
           that.priceDataLstARR[1]=newArray.price_area_b,
diff --git a/src/views/consultant/list.vue b/src/views/consultant/list.vue
index c4d086a..3ddaa04 100644
--- a/src/views/consultant/list.vue
+++ b/src/views/consultant/list.vue
@@ -256,16 +256,9 @@
 </script>
 
 <style scoped>
-<<<<<<< HEAD
 .expert-list>li{
 }
 .my-content{
 	padding-top: 1rem;
 }
 </style>
-=======
-	.expert-list {
-		margin-top: 1.2rem;
-	}
-</style>
->>>>>>> 2e3bf35c8277742f7f114de60ac3ba103f75ee67