fix backport

(cherry picked from commit 8075854)

Author: norareidy

source/whats-new.txt

@@ -866,13 +866,8 @@ What's New in 4.0
 
 .. warning:: Breaking Changes in v4.0
 
-<<<<<<< HEAD
-   This driver version introduces breaking changes. For a list of these changes, see 
-   the :ref:`Version 4.x Breaking Changes section <node-breaking-changes-v4.x>` in 
-=======
    This driver version introduces breaking changes. For a list of these changes, see
    the :ref:`Version 4.0 Breaking Changes section <node-breaking-changes-v4.0>` in
->>>>>>> 6d2df34 (DOCSP-32561: Exact versions in upgrade guide (#887))
    the Upgrade guide.
 
 New features of the 4.0 Node.js driver release include:
@@ -883,7 +878,6 @@ New features of the 4.0 Node.js driver release include:
    inadvertently changed to behave like ``collection.countDocuments()``. This behavior 
    is corrected in :ref:`version 4.4 <version-4.4>`.
 
-
 TypeScript
 ~~~~~~~~~~