diff --git a/source/security-and-authentication/mongodb-aws-auth.txt b/source/security-and-authentication/mongodb-aws-auth.txt
index 1e96b2f..6ac2b08 100644
--- a/source/security-and-authentication/mongodb-aws-auth.txt
+++ b/source/security-and-authentication/mongodb-aws-auth.txt
@@ -31,16 +31,10 @@ AWS IAM credentials, see the guide on :atlas:`How to Set Up Unified AWS Access <
 
 .. important::
 
-<<<<<<< HEAD
-   You must use {+connector+} version 1.5 of later to connect to a MongoDB
-   server set up to authenticate using your AWS IAM credentials. AWS IAM
+   You must use {+connector+} version 1.5 of later to connect to a {+cluster+}
+   set up to authenticate using your AWS IAM credentials. AWS IAM
    credential authentication is available in MongoDB server version 4.4
    and later.
-=======
-   You need to use {+connector+} version 1.5 of later to connect to a {+cluster+} set up
-   to authenticate using your AWS IAM credentials. AWS IAM credential authentication is
-   available in {+cluster+} version 4.4 and later.
->>>>>>> c6d353c (change MongoDB sercer to cluster constant)
 
 Connector Connection Settings
 -----------------------------