Fix

Author: mcmorisi

source/read/retrieve.txt

@@ -141,12 +141,7 @@ named arguments to them. The following table describes the commonly used argumen
      - | Limits the number of documents to hold in a cursor at a given time.
 
    * - ``collation`` 
-<<<<<<< HEAD
      - | An instance of the ``Collation`` class that sets the collation options. 
-=======
-     - | The collation options for the find operation. See the :ref:`pymongo-retrieve-collation`
-         guide for more information.
->>>>>>> ea2dd75 (DOCSP-48206: Comment page 404 (#205))
 
    * - ``comment`` 
      - | A string to attach to the query. This can help you trace and interpret the