title: Git Conflict Markers showing a different file update
body: <p>We are merging Master into Feature Branch and suddenly, we observed some files where conflicts appeared.</p>
  <ol>
  <li>These files were never moved to Master</li>
  <li>Conflict marker in files were showing Head in correct part but Master markers showing content from a completely different file.</li>
  </ol>
  <p>Not sure how 2. is possible? we are truly scared now.</p>
  <pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  &lt;ApexPage xmlns=http://soap.sforce.com/2006/04/metadata&gt;
  &lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:salesforce_sfdx/force-app/main/default/pages/xyz.page-meta.xml
      &lt;apiVersion&gt;53.0&lt;/apiVersion&gt;
      &lt;label&gt;xyz&lt;/label&gt;
  ========
      &lt;apiVersion&gt;55.0&lt;/apiVersion&gt;
      &lt;label&gt;abc&lt;/label&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt; development:salesforce_sfdx/force-app/main/default/pages/abc.page-meta.xml
  &lt;/ApexPage&gt;
  </code></pre>