resolve the conflicts and add CHANGELOG

CHANGELOG.md

@@ -30,3 +30,4 @@
 - [docs: Update Readme.md](https://github.com/Tencent/spring-cloud-tencent/pull/381)
 - [docs:optimize example](https://github.com/Tencent/spring-cloud-tencent/pull/386)
 - [Feature: support spring cloud gateway routers](https://github.com/Tencent/spring-cloud-tencent/pull/388)
+- [Optimize:optimize load balancer code and add testcase](https://github.com/Tencent/spring-cloud-tencent/pull/379)

spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java

@@ -18,9 +18,8 @@
 
 package com.tencent.cloud.polaris.loadbalancer;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.tencent.cloud.common.metadata.MetadataContext;