fix conflicts when merge remote

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Change Log
 ---
 
+- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/481)
 - [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/issues/462)

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java

@@ -30,7 +30,6 @@ import com.tencent.polaris.client.api.SDKContext;
 import org.apache.commons.lang.StringUtils;
 
 import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
@@ -40,7 +39,7 @@ import org.springframework.util.CollectionUtils;
  *
  * @author Haotian Zhang, Andrew Shan, Jie Cheng, Palmer.Xu
  */
-public class PolarisRegistration implements Registration, ServiceInstance {
+public class PolarisRegistration implements Registration {
 
 	private final static String METADATA_KEY_IP = "internal-ip";