chore(clients): add config for fips and dualStack endpoint (aws#2947)

Author: trivikr

private/aws-echo-service/src/EchoServiceClient.ts

@@ -129,7 +129,6 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
   logger?: __Logger;
 
   /**
-<<<<<<< HEAD
    * Enables IPv6/IPv4 dualstack endpoint.
    */
   useDualstackEndpoint?: boolean | __Provider<boolean>;
@@ -140,8 +139,6 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
   useFipsEndpoint?: boolean | __Provider<boolean>;
 
   /**
-=======
->>>>>>> e6065437ed (feat(private): add generic client aws-echo-service (#2950))
    * The provider populating default tracking information to be sent with `user-agent`, `x-amz-user-agent` header
    * @internal
    */