diff --git a/source/faq/fundamentals.txt b/source/faq/fundamentals.txt
index 7474b421661..e2dc7f4c53b 100644
--- a/source/faq/fundamentals.txt
+++ b/source/faq/fundamentals.txt
@@ -75,7 +75,6 @@ and perform the following operation:
   :method:`db.collection.createIndex()` method or 
   :method:`db.collection.insertOne()` method would have created
   the ``myNewDb`` database automatically.
-<<<<<<< HEAD
 
 You can also create a collection explicitly using
 :method:`db.createCollection` method if you want to specify specific
@@ -86,18 +85,6 @@ or document validation rules:
 
    use myNewDB;
 
-=======
-
-You can also create a collection explicitly using
-:method:`db.createCollection` method if you want to specify specific
-:ref:`options<create_collection_parameters>`, such as maximum size
-or document validation rules:
-
-.. code-block:: javascript
-
-   use myNewDB;
-
->>>>>>> 275b25d49 (DOCSP-14047 add note about mongoshell to page)
    db.createCollection("myNewCollection1");
 
 .. _faq-schema-free: