diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties
index ca95db1c..f2c6bf32 100644
--- a/servers/boe-server-all/src/main/resources/application-pro.properties
+++ b/servers/boe-server-all/src/main/resources/application-pro.properties
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-
-
-
-
-
-
 # cloud nacos config
 spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848