diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index 14b51db55e..337f6dd429 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -402,7 +402,8 @@
     and a unique index is present and a duplicate row is concurrently
     inserted, then a uniqueness violation error is raised;
     <command>MERGE</command> does not attempt to avoid such
-    errors by evaluating <literal>MATCHED</literal> conditions.
+    errors by restarting evaluation of <literal>MATCHED</literal>
+    conditions.
    </para>
 
    <para>
diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml
index 7f73f3d89c..a129a6edd5 100644
--- a/doc/src/sgml/ref/merge.sgml
+++ b/doc/src/sgml/ref/merge.sgml
@@ -266,10 +266,6 @@ DELETE
       filled with a default value, either its declared default value
       or null if there is none.
      </para>
-     <para>
-      If the expression for any column is not of the correct data type,
-      automatic type conversion will be attempted.
-     </para>
      <para>
       If <replaceable class="parameter">target_table_name</replaceable>
       is a partitioned table, each row is routed to the appropriate partition
@@ -581,12 +577,12 @@ WHEN NOT MATCHED THEN
 <programlisting>
 MERGE INTO CustomerAccount CA
 USING (Select CustomerId, TransactionValue From RecentTransactions) AS T
-ON CA.CustomerId = T.CustomerId
+ON T.CustomerId = CA.CustomerId
+WHEN MATCHED THEN
+  UPDATE SET Balance = Balance + TransactionValue;
 WHEN NOT MATCHED THEN
   INSERT (CustomerId, Balance)
   VALUES (T.CustomerId, T.TransactionValue)
-WHEN MATCHED THEN
-  UPDATE SET Balance = Balance + TransactionValue;
 </programlisting>
   </para>