diff --git a/gulimall-product/src/main/resources/application.yml b/gulimall-product/src/main/resources/application.yml
index 74f2710..788ab7a 100644
--- a/gulimall-product/src/main/resources/application.yml
+++ b/gulimall-product/src/main/resources/application.yml
@@ -69,7 +69,6 @@ gulimall:
     corePoolSize: 10
     maxPoolSize: 20
     keepAliveTime: 300
-<<<<<<< HEAD
 management:
   endpoints:
     web:
@@ -78,5 +77,3 @@ management:
 feign:
   sentinel:
     enabled: true
-=======
->>>>>>> 9e4857d66f652e179bc55f579092d12e93ed463a