spacing

Author: rachel-mack

source/upgrade.txt

@@ -61,25 +61,21 @@ the version after v4.0 including any listed under v4.5.
 Version 5.0 Breaking Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
 - This driver version introduces the following changes to the ``ConnectionId`` class:
 
   - The ``ConnectionId`` constructor now accepts a value of type ``long`` as its second
     parameter instead of type ``int``. Similarly, the constructor now accepts a value of
     type ``Long`` as its third parameter instead of type ``Integer``. Because this change breaks
     binary compatibility, recompile any existing code that calls the ``ConnectionId`` constructor.
-=======
-This driver version introduces the following breaking changes:
->>>>>>> 5700e72 (rm/cc feedback)
 
 - Changes the data type of the timeout duration parameter in the
-  ``SocketSettings.Builder.connectTimeout()`` and ``SocketSettings.Builder.readTimeout()``
-  methods. The data type of this parameter is now ``long`` instead of ``int``.
-  To view an
-  example that shows how to instantiate a ``SocketSettings`` instance by using
-  these methods, see the :ref:`SocketSettings Example
-  <java-socketsettings-example>` in the Specify MongoClient Settings
-  guide.
+  ``SocketSettings.Builder.connectTimeout()`` and
+  ``SocketSettings.Builder.readTimeout()`` methods. The data type of this
+  parameter is now ``long`` instead of ``int``. To view an example that shows
+  how to call ``SocketSettings`` methods, see the :ref:`SocketSettings Example
+  <java-socketsettings-example>` in the Specify MongoClient Settings guide. This
+  change breaks binary compatibility (requires recompiling) but does not require
+  code changes.
 
   - The ``getServerValue()`` method now returns a value of type ``Long`` instead of type
     ``Integer``. Similarly, the ``getLocalValue()`` method returns a value of type
@@ -151,7 +147,7 @@ This driver version introduces the following breaking changes:
 
      ClusterSettings.builder()
          .hosts(Collections.singletonList(
-                 new ServerAddress("127.0.0.1", 27017)
+                new ServerAddress("127.0.0.1", 27017)
          ))
          .requiredReplicaSetName("replset")
          .build()