diff --git a/src/main/java/com/yau/digitalrmb/platformintegration/interfaces/PlatformSsoController.java b/src/main/java/com/yau/digitalrmb/platformintegration/interfaces/PlatformSsoController.java
index 196ed9d..10be3ba 100644
--- a/src/main/java/com/yau/digitalrmb/platformintegration/interfaces/PlatformSsoController.java
+++ b/src/main/java/com/yau/digitalrmb/platformintegration/interfaces/PlatformSsoController.java
@@ -4,13 +4,8 @@ import com.yau.digitalrmb.identity.application.LocalSsoAccountService;
 import com.yau.digitalrmb.platformintegration.application.PlatformTokenVerifier;
 import com.yau.digitalrmb.platformintegration.application.VerifiedPlatformToken;
 import com.yau.digitalrmb.platformintegration.config.PlatformIntegrationProperties;
-<<<<<<< HEAD
-import com.yau.digitalrmb.security.application.LoginExchangeCodeService;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-=======
 import com.yau.digitalrmb.security.application.JwtTokenService;
 import io.swagger.v3.oas.annotations.Operation;
->>>>>>> origin/master
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 2316a2e..36a3a99 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -9,14 +9,6 @@ security:
     secret: 0123456789012345678901234567890123456789012345678901234567890123
     access-token-ttl: PT30M
 platform-integration:
-<<<<<<< HEAD
-  enabled: true
-  datasource:
-    url: jdbc:h2:mem:platform;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=TRUE
-    username: sa
-    password: test-password
-=======
->>>>>>> origin/master
   token:
     link-secret-key: local-token-sso-test-secret-key-123456
   frontend: