diff --git a/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 6710490..f797d3a 100644
--- a/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,5 +1,2 @@
 com.couplet.remote.factory.RemoteVehicleFallbackFactory
-<<<<<<< HEAD
 com.couplet.remote.factory.RemoteTroubleFallbackFactory
-=======
->>>>>>> f07dc73 (远程调用 加自动配置扫描)