fix errors

diff --git a/en/manual.xml b/en/manual.xml
index 199d5ee..ff0f08c 100644 (file)
--- a/en/manual.xml
+++ b/en/manual.xml
@@ -16096,7 +16096,7 @@ location: [STAFF, ISO]</programlisting>Will block items with an itype code of
             </listitem>
           </itemizedlist>
         </section>
->>>>>>> 7f1400a... update match checks section with guide by Joy Nelson
+
         <section id="samplerecordmatch">
           <title>Sample Record Matching Rule: Control Number</title>