Fixed a few DIFF messages in the Style Guide

Author: Anthony Sansone

source/style-guide/error-message-guidelines.txt

@@ -8,20 +8,12 @@ Error Message Guidelines
 
 .. include:: /includes/styles/corrections.rst
 
-<<<<<<< HEAD
-Developers often ask an Information Developer to edit error messages
-=======
 Developers often ask an Technical Writer to edit error messages
->>>>>>> 9614a09... (DOCSP-6719): Updated Style Guide starting with port of Rackspace Style Guide.
 that they have written.
 
 When you edit error messages, use the writing guidelines in this Style
 Guide as you would with other documentation that is curated by the
-<<<<<<< HEAD
-Information Development team. Start with the information in the
-=======
 Documentation team. Start with the information in the
->>>>>>> 9614a09... (DOCSP-6719): Updated Style Guide starting with port of Rackspace Style Guide.
 :ref:`quickstart`.
 
 This topic provides additional guidelines specific to reviewing

source/style-guide/quickstart.txt

@@ -13,17 +13,13 @@ Don't worry if your job title doesn't include the word *writer*,
 knowledge and expertise. Your willingness to share what you know with
 users will help them to accomplish their goals and be successful.
 
-<<<<<<< HEAD
-The Information Development team is ready to help turn your
-=======
-The Documentation team is ready to help turn your
->>>>>>> 9614a09... (DOCSP-6719): Updated Style Guide starting with port of Rackspace Style Guide.
-contributions into clear, concise, consistent, easy-to-read content for
-users. We do this, in part, by adhering to the standards that are
-defined in this style guide. The team doesn't expect contributors to
-know or adhere to all of these standards; however, if you are
-interested in improving your writing or learning some of the style
-standards at MongoDB, we invite you to explore them.
+The Documentation team is ready to help turn your contributions into
+clear, concise, consistent, easy-to-read content for users. We do this,
+in part, by adhering to the standards that are defined in this style
+guide. The team doesn't expect contributors to know or adhere to all of
+these standards; however, if you are interested in improving your
+writing or learning some of the style standards at MongoDB, we invite
+you to explore them.
 
 The style guide includes hundreds of standards, but you can start with
 the following ones to help you boost the effectiveness of your writing.

source/style-guide/revision-history.txt

@@ -6,19 +6,14 @@ This file summarizes the changes that have been made to the style
 guide.
 
 2020-08-03
-----------
+~~~~~~~~~~
 
 Updated to MongoDB style.
 
 2019-07-19
 ~~~~~~~~~~
-<<<<<<< HEAD
 Revised v2 based on material from MongoDB, Google, and MailChimp. All
 licensed under Creative Commons 4.0 license.
-=======
-Revised v2 based on material from MongoDB, Rackspace, Google, and
-MailChimp. All licensed under Creative Commons 4.0 license.
->>>>>>> 9614a09... (DOCSP-6719): Updated Style Guide starting with port of Rackspace Style Guide.
 
 2016-01-05
 ~~~~~~~~~~

source/style-guide/style/cloud-account-info.txt

@@ -101,15 +101,7 @@ to see actual values from the system, use "real-looking" but imaginary values, u
      - a1a1a1a1a1a1a1a1a1a1a1a1
      - 6c2c15110ceb948cf4b8f38c
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-.. code-block::
-=======
-.. code-block:: ini
->>>>>>> 9614a09... (DOCSP-6719): Updated Style Guide starting with port of Rackspace Style Guide.
-=======
 .. tip::
->>>>>>> 417f140... (DOCSP-11404) API placeholders
 
    Use a random number generator to create the placeholders. One example would be the
    `Generate Random Hex <https://www.browserling.com/tools/random-hex>`__