*

source/connect.txt

@@ -150,7 +150,6 @@ the shell connected to your selected deployment.
 
    :mongosh:`Perform CRUD Operations in the MongoDB Shell </crud>`
 
-<<<<<<< HEAD
 
 .. _vsce-connect-task-atlas-streams:
 
@@ -217,44 +216,6 @@ For details on how to configure Atlas Stream Processing, see
          :figwidth: 700px
          :alt: Image of a stream processing template
 
-.. _vsce-rename-connection:
-
-Rename a Connection
--------------------
-
-To rename a connection to a deployment in |vsce|:
-
-.. include:: /includes/steps/rename-connection.rst
-
-.. _vsce-disconnect-task:
-
-Disconnect from a Deployment
-----------------------------
-
-|vsce| provides two methods to disconnect from a deployment. You can:
-
-- Disconnect with the Command Palette, or
-- Disconnect from the :guilabel:`MongoDB` view in the 
-  :guilabel:`Activity Bar`.
-
-.. tabs::
-
-   .. tab:: Disconnect from the MongoDB View
-      :tabid: mdb-view
-
-      .. include:: /includes/steps/disconnect-mongodb-view.rst
-
-   .. tab:: Disconnect with the Command Palette
-      :tabid: command-palette
-
-      .. include:: /includes/steps/disconnect-command-palette.rst
-
-Disconnecting from a MongoDB instance closes the |vsce| connection to 
-the active instance. You must :ref:`reconnect <vsce-connect-task>` to 
-interact with data in your deployment again.
-=======
->>>>>>> a435c8d (*)
-
 .. _vsce-edit-connection-task:
 
 Edit a Connection