fix

Author: mongoKart

source/fundamentals/connection/mongoclientsettings.txt

@@ -229,13 +229,8 @@ settings to modify the driver's behavior:
        |
        | **Default**: ``15 milliseconds``
 
-<<<<<<< HEAD
-   * - ``mode​()``
-     - Sets how to connect to a MongoDB server.
-=======
    * - ``mode()``
      - Sets how to connect to a MongoDB deployment.
->>>>>>> a460fec (DOCSP-26498 - Standardize MongoDB Server Naming (#399))
 
    * - ``requiredClusterType()``
      - Sets the type of cluster required for the cluster.