diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
index 1da9a82b424..8b108d0929a 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
@@ -37,7 +37,6 @@ import com.vmware.nsx_policy.model.ApiError;
 import com.vmware.nsx_policy.model.DhcpRelayConfig;
 import com.vmware.nsx_policy.model.EnforcementPointListResult;
 import com.vmware.nsx_policy.model.L4PortSetServiceEntry;
-<<<<<<< HEAD
 import com.vmware.nsx_policy.model.LBAppProfileListResult;
 import com.vmware.nsx_policy.model.LBPool;
 import com.vmware.nsx_policy.model.LBPoolListResult;
@@ -45,8 +44,6 @@ import com.vmware.nsx_policy.model.LBPoolMember;
 import com.vmware.nsx_policy.model.LBService;
 import com.vmware.nsx_policy.model.LBVirtualServer;
 import com.vmware.nsx_policy.model.LBVirtualServerListResult;
-=======
->>>>>>> ce1659e8fcce61e0a6e7c75190af668f75172c87
 import com.vmware.nsx_policy.model.LocaleServicesListResult;
 import com.vmware.nsx_policy.model.PolicyNatRule;
 import com.vmware.nsx_policy.model.Segment;
@@ -72,7 +69,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 
 import java.util.List;
-<<<<<<< HEAD
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
@@ -86,11 +82,6 @@ import static org.apache.cloudstack.utils.NsxControllerUtils.getVirtualServerNam
 import static org.apache.cloudstack.utils.NsxControllerUtils.getServiceEntryName;
 import static org.apache.cloudstack.utils.NsxControllerUtils.getLoadBalancerName;
 import static org.apache.cloudstack.utils.NsxControllerUtils.getLoadBalancerAlgorithm;
-=======
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
->>>>>>> ce1659e8fcce61e0a6e7c75190af668f75172c87
 
 public class NsxApiClient {
 
@@ -128,7 +119,6 @@ public class NsxApiClient {
         BYPASS
     }
 
-<<<<<<< HEAD
     public enum LBAlgorithm {
         ROUND_ROBIN,
         LEAST_CONNECTION,
@@ -142,8 +132,6 @@ public class NsxApiClient {
         XLARGE
     }
 
-=======
->>>>>>> ce1659e8fcce61e0a6e7c75190af668f75172c87
     public enum  RouteAdvertisementType { TIER1_STATIC_ROUTES, TIER1_CONNECTED, TIER1_NAT,
         TIER1_LB_VIP, TIER1_LB_SNAT, TIER1_DNS_FORWARDER_IP, TIER1_IPSEC_LOCAL_ENDPOINT
     }