Add missing changes during merge

Author: varunnvs92

core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java

@@ -56,7 +56,8 @@ public abstract class AbstractAws4Signer<T extends Aws4SignerParams, U extends A
     private static final int SIGNER_CACHE_MAX_SIZE = 300;
     private static final FifoCache<SignerKey> SIGNER_CACHE =
         new FifoCache<>(SIGNER_CACHE_MAX_SIZE);
-    private static final List<String> LIST_OF_HEADERS_TO_IGNORE_IN_LOWER_CASE = Arrays.asList("connection", "x-amzn-trace-id");
+    private static final List<String> LIST_OF_HEADERS_TO_IGNORE_IN_LOWER_CASE =
+        Arrays.asList("connection", "x-amzn-trace-id", "user-agent");
 
     protected SdkHttpFullRequest.Builder doSign(SdkHttpFullRequest request,
                                                 Aws4SignerRequestParams requestParams,

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java

@@ -277,7 +277,6 @@ public interface Builder extends SdkAsyncHttpClient.Builder<NettyNioAsyncHttpCli
         Builder protocol(Protocol protocol);
 
         /**
-<<<<<<< HEAD
          * Add new socket channel option which will be used to create Netty Http client. This allows custom configuration
          * for Netty.
          * @param channelOption {@link ChannelOption} to set