DOCS-14914 keyfile fails to rotate (mongodb#6125)

Co-authored-by: jason-price-mongodb <[email protected]>

Author: jason-price-mongodb

source/tutorial/rotate-key-replica-set.txt

@@ -4,9 +4,12 @@ Rotate Keys for Replica Sets
 
 .. default-domain:: mongodb
 
+<<<<<<< HEAD
 .. role:: red(strong)
    :class: text-danger
 
+=======
+>>>>>>> abb7fac02... DOCS-14914 keyfile fails to rotate (#6125)
 Replica set members can use :ref:`keyfiles <internal-auth-keyfile>` to
 authenticate each other as memers of the same deployment.
 
@@ -64,6 +67,7 @@ sequence of keys.
    keyfile using any method you choose (e.g. ``openssl rand -base64
    756``, etc.).
 
+<<<<<<< HEAD
 .. container::
 
    .. tabs::
@@ -91,6 +95,14 @@ sequence of keys.
               .. figure:: /images/example-multiple-keys2.png
                  :alt: Image of multiple key string sequence.
                  :figwidth: 600px
+=======
+You can specify multiple key strings as a sequence of key
+strings (optionally enclosed in single or double quotes).
+
+.. figure:: /images/example-multiple-keys2.png
+   :alt: Image of multiple key string sequence.
+   :figwidth: 600px
+>>>>>>> abb7fac02... DOCS-14914 keyfile fails to rotate (#6125)
 
 2. Restart Each Member
 ~~~~~~~~~~~~~~~~~~~~~~