diff --git a/source/fundamentals/crud/read-operations/retrieve.txt b/source/fundamentals/crud/read-operations/retrieve.txt
index 3a5e847c..b1f7d294 100644
--- a/source/fundamentals/crud/read-operations/retrieve.txt
+++ b/source/fundamentals/crud/read-operations/retrieve.txt
@@ -111,11 +111,8 @@ following methods:
    * - ``SetLimit()`` 
      - | The maximum number of documents to return. 
        | Default: ``0`` 
-
-       .. note::
-
-          This option is not available for ``FindOneOptions``. The
-          ``FindOne()`` method internally uses ``SetLimit(-1)``.
+       | This option is not available for ``FindOneOptions``. The
+        ``FindOne()`` method internally uses ``SetLimit(-1)``.
 
    * - ``SetProjection()`` 
      - | The fields to include in the returned documents. 
diff --git a/source/fundamentals/run-command.txt b/source/fundamentals/run-command.txt
index 00f8056c..89f9b055 100644
--- a/source/fundamentals/run-command.txt
+++ b/source/fundamentals/run-command.txt
@@ -90,12 +90,8 @@ with the following fields:
 
    * - ``operationTime``
      - Indicates the logical time of the operation. MongoDB uses the
-       logical time to order operations.
-       
-       .. seealso::
-  
-          To learn more about logical time, see our :website:`blog post about
-          the Global Logical Clock </blog/post/transactions-background-part-4-the-global-logical-clock>`.
+       logical time to order operations. To learn more about logical time, see our :website:`blog post about
+       the Global Logical Clock </blog/post/transactions-background-part-4-the-global-logical-clock>`.
 
    * - ``$clusterTime``
      - Provides a document that returns the signed cluster time. Cluster time is a
diff --git a/source/fundamentals/transactions.txt b/source/fundamentals/transactions.txt
index efa12652..c9b6a382 100644
--- a/source/fundamentals/transactions.txt
+++ b/source/fundamentals/transactions.txt
@@ -93,6 +93,7 @@ following table describes these methods:
          error if there is no active transaction for the session or if the
          transaction was ended. To learn more about
          this method, see the :manual:`commitTransaction() page
+<<<<<<< HEAD
          </reference/method/Session.commitTransaction/>`  in the Server manual.
 
        .. note:: Retrying a Transaction
@@ -105,6 +106,16 @@ following table describes these methods:
           ``UnknownTransactionCommitResult`` label. If you rerun the
           ``CommitTransaction()`` method after receiving this error,
           your data is not changed by the repeat attempts.
+=======
+         </reference/method/Session.commitTransaction/>`  in the Server manual. 
+       |
+       | The ``CommitTransaction()`` method is an idempotent function, which 
+         means that you can attempt to commit a transaction multiple times without changing data after the first successful commit. 
+         A transaction can succeed but return an error with the 
+         ``UnknownTransactionCommitResult`` label. If you rerun the
+         ``CommitTransaction()`` method after receiving this error,
+         your data is not changed by the repeat attempts.
+>>>>>>> cb6466d (Docsp 42960 nested components (#387))
 
        |
        | **Parameter**: ``Context``