chore: fix merge conflict in test xml sample

test/data/OSMD_function_test_chord_tests_various.musicxml

@@ -8,11 +8,7 @@
     <rights>Copyright © </rights>
     <encoding>
       <software>MuseScore 3.4.2</software>
-<<<<<<< HEAD
-      <encoding-date>2021-01-21</encoding-date>
-=======
       <encoding-date>2021-02-09</encoding-date>
->>>>>>> develop-public-osmd
       <supports element="accidental" type="yes"/>
       <supports element="beam" type="yes"/>
       <supports element="print" attribute="new-page" type="yes" value="yes"/>
@@ -68,30 +64,18 @@
       </score-part>
     </part-list>
   <part id="P1">
-<<<<<<< HEAD
-    <measure number="1" width="185.91">
-      <print>
-        <system-layout>
-          <system-margins>
-            <left-margin>20.76</left-margin>
-=======
     <measure number="1" width="176.63">
       <print>
         <system-layout>
           <system-margins>
             <left-margin>0.00</left-margin>
->>>>>>> develop-public-osmd
             <right-margin>0.00</right-margin>
             </system-margins>
           <top-system-distance>170.00</top-system-distance>
           </system-layout>
         </print>
       <attributes>
-<<<<<<< HEAD
-        <divisions>1</divisions>
-=======
         <divisions>2</divisions>
->>>>>>> develop-public-osmd
         <key>
           <fifths>0</fifths>
           </key>
@@ -115,11 +99,7 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -136,21 +116,13 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="2" width="141.67">
-=======
     <measure number="2" width="158.79">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
@@ -167,17 +139,6 @@
           <degree-type>subtract</degree-type>
           </degree>
         </harmony>
-<<<<<<< HEAD
-      <note default-x="11.73" default-y="-15.00">
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-          </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-=======
       <note default-x="11.99" default-y="-20.00">
         <pitch>
           <step>B</step>
@@ -199,7 +160,6 @@
         <type>quarter</type>
         <stem>none</stem>
         <notehead>slash</notehead>
->>>>>>> develop-public-osmd
         </note>
       <harmony print-frame="no">
         <root>
@@ -217,20 +177,6 @@
           <degree-type>subtract</degree-type>
           </degree>
         </harmony>
-<<<<<<< HEAD
-      <note default-x="83.33" default-y="-15.00">
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-          </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-        </note>
-      </measure>
-    <measure number="3" width="160.57">
-=======
       <note default-x="83.59" default-y="-20.00">
         <pitch>
           <step>B</step>
@@ -255,39 +201,10 @@
         </note>
       </measure>
     <measure number="3" width="210.56">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
           </root>
-<<<<<<< HEAD
-        <kind text="11sus4">suspended-fourth</kind>
-        <degree>
-          <degree-value text="">7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">9</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        </harmony>
-      <note default-x="11.73" default-y="-15.00">
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-          </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-=======
         <kind>suspended-fourth</kind>
         <degree>
           <degree-value>7</degree-value>
@@ -315,45 +232,11 @@
         <type>half</type>
         <stem>down</stem>
         <notehead>slash</notehead>
->>>>>>> develop-public-osmd
         </note>
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
           </root>
-<<<<<<< HEAD
-        <kind text="13sus4">suspended-fourth</kind>
-        <degree>
-          <degree-value text="">7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">9</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">13</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        </harmony>
-      <note default-x="94.42" default-y="-15.00">
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-          </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-        <stem>down</stem>
-=======
         <kind>suspended-fourth</kind>
         <degree>
           <degree-value>7</degree-value>
@@ -418,17 +301,12 @@
         <notations>
           <tied type="stop"/>
           </notations>
->>>>>>> develop-public-osmd
         </note>
       <barline location="right">
         <bar-style>light-light</bar-style>
         </barline>
       </measure>
-<<<<<<< HEAD
-    <measure number="4" width="128.44">
-=======
     <measure number="4" width="119.17">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
@@ -440,11 +318,7 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -461,38 +335,22 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="5" width="141.74">
-=======
     <measure number="5" width="132.47">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
           </root>
-<<<<<<< HEAD
-        <kind text="7sus2">suspended-second</kind>
-        <degree>
-          <degree-value text="">7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-=======
         <kind>suspended-second</kind>
         <degree>
           <degree-value>7</degree-value>
           <degree-alter>0</degree-alter>
           <degree-type>add</degree-type>
->>>>>>> develop-public-osmd
           </degree>
         </harmony>
       <note default-x="11.73" default-y="-15.00">
@@ -500,11 +358,7 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -513,18 +367,6 @@
         <root>
           <root-step>C</root-step>
           </root>
-<<<<<<< HEAD
-        <kind text="9sus2">suspended-second</kind>
-        <degree>
-          <degree-value text="">7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">9</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-=======
         <kind>suspended-second</kind>
         <degree>
           <degree-value>7</degree-value>
@@ -535,7 +377,6 @@
           <degree-value>9</degree-value>
           <degree-alter>0</degree-alter>
           <degree-type>add</degree-type>
->>>>>>> develop-public-osmd
           </degree>
         </harmony>
       <note default-x="83.40" default-y="-15.00">
@@ -543,42 +384,17 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="6" width="155.05">
-=======
     <measure number="6" width="145.78">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
           </root>
-<<<<<<< HEAD
-        <kind text="11sus2">suspended-second</kind>
-        <degree>
-          <degree-value text="">7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">9</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-=======
         <kind>suspended-second</kind>
         <degree>
           <degree-value>7</degree-value>
@@ -594,7 +410,6 @@
           <degree-value>11</degree-value>
           <degree-alter>0</degree-alter>
           <degree-type>add</degree-type>
->>>>>>> develop-public-osmd
           </degree>
         </harmony>
       <note default-x="11.73" default-y="-15.00">
@@ -602,11 +417,7 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -615,28 +426,6 @@
         <root>
           <root-step>C</root-step>
           </root>
-<<<<<<< HEAD
-        <kind text="13sus2">suspended-second</kind>
-        <degree>
-          <degree-value text="">7</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">9</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-          </degree>
-        <degree>
-          <degree-value text="">13</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type text="">add</degree-type>
-=======
         <kind>suspended-second</kind>
         <degree>
           <degree-value>7</degree-value>
@@ -657,7 +446,6 @@
           <degree-value>13</degree-value>
           <degree-alter>0</degree-alter>
           <degree-type>add</degree-type>
->>>>>>> develop-public-osmd
           </degree>
         </harmony>
       <note default-x="94.49" default-y="-15.00">
@@ -665,21 +453,13 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="7" width="151.59">
-=======
     <measure number="7" width="142.32">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
@@ -691,22 +471,14 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
         </note>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
@@ -718,38 +490,22 @@
         </harmony>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="8" width="297.32">
-      <print new-system="yes">
-        <system-layout>
-          <system-margins>
-            <left-margin>20.76</left-margin>
-=======
     <measure number="8" width="282.73">
       <print new-system="yes">
         <system-layout>
           <system-margins>
             <left-margin>0.00</left-margin>
->>>>>>> develop-public-osmd
             <right-margin>0.00</right-margin>
             </system-margins>
           <system-distance>150.00</system-distance>
@@ -760,82 +516,42 @@
           <root-step>C</root-step>
           </root>
         <kind text="mmaj7" parentheses-degrees="yes">major-minor</kind>
-<<<<<<< HEAD
-        <degree>
-          <degree-value>9</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-          </degree>
-        </harmony>
-      <note default-x="58.17" default-y="-15.00">
-=======
         </harmony>
       <note default-x="58.18" default-y="-15.00">
->>>>>>> develop-public-osmd
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
         </note>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
       <harmony print-frame="no">
         <root>
-<<<<<<< HEAD
-          <root-step text="">C</root-step>
-=======
           <root-step>C</root-step>
->>>>>>> develop-public-osmd
           </root>
         <kind text="N.C.">none</kind>
         </harmony>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="9" width="177.17">
-      <harmony print-frame="no">
-        <root>
-          <root-step text="">C</root-step>
-          </root>
-        <kind text="NC">none</kind>
-        </harmony>
-      <note default-x="12.17" default-y="-15.00">
-=======
     <measure number="9" width="181.69">
       <harmony print-frame="no">
         <root>
@@ -844,27 +560,18 @@
         <kind text="NC">none</kind>
         </harmony>
       <note default-x="11.73" default-y="-15.00">
->>>>>>> develop-public-osmd
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
         </note>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
@@ -879,40 +586,24 @@
           <degree-type>add</degree-type>
           </degree>
         </harmony>
-<<<<<<< HEAD
-      <note default-x="93.87" default-y="-15.00">
-=======
       <note default-x="95.91" default-y="-15.00">
->>>>>>> develop-public-osmd
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
         </note>
       <note>
         <rest/>
-<<<<<<< HEAD
-        <duration>1</duration>
-=======
         <duration>2</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>quarter</type>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="10" width="181.13">
-=======
     <measure number="10" width="167.07">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
@@ -929,11 +620,7 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -949,30 +636,18 @@
           <degree-type>add</degree-type>
           </degree>
         </harmony>
-<<<<<<< HEAD
-      <note default-x="95.45" default-y="-15.00">
-=======
       <note default-x="88.42" default-y="-15.00">
->>>>>>> develop-public-osmd
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="11" width="230.65">
-=======
     <measure number="11" width="204.76">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
@@ -983,25 +658,13 @@
           <degree-alter>0</degree-alter>
           <degree-type>add</degree-type>
           </degree>
-<<<<<<< HEAD
-        <degree>
-          <degree-value>11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-          </degree>
-=======
->>>>>>> develop-public-osmd
         </harmony>
       <note default-x="11.73" default-y="-15.00">
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -1016,42 +679,19 @@
           <degree-alter>0</degree-alter>
           <degree-type>add</degree-type>
           </degree>
-<<<<<<< HEAD
-        <degree>
-          <degree-value>11</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-          </degree>
-        <degree>
-          <degree-value>13</degree-value>
-          <degree-alter>0</degree-alter>
-          <degree-type>add</degree-type>
-          </degree>
-        </harmony>
-      <note default-x="120.21" default-y="-15.00">
-=======
         </harmony>
       <note default-x="107.26" default-y="-15.00">
->>>>>>> develop-public-osmd
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
         </note>
       </measure>
-<<<<<<< HEAD
-    <measure number="12" width="178.69">
-=======
     <measure number="12" width="249.46">
->>>>>>> develop-public-osmd
       <harmony print-frame="no">
         <root>
           <root-step>C</root-step>
@@ -1083,11 +723,7 @@
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -1118,20 +754,12 @@
           <degree-type>add</degree-type>
           </degree>
         </harmony>
-<<<<<<< HEAD
-      <note default-x="89.73" default-y="-15.00">
-=======
       <note default-x="126.98" default-y="-15.00">
->>>>>>> develop-public-osmd
         <pitch>
           <step>C</step>
           <octave>5</octave>
           </pitch>
-<<<<<<< HEAD
-        <duration>2</duration>
-=======
         <duration>4</duration>
->>>>>>> develop-public-osmd
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>