title: Git merge left HEAD marks in my files
body: <p>I tried to merge a file in the command line using Git, when an error message appeared telling me the merge was aborted. </p>
  
  <p>I thought that was the end of it, but then I realized there are gitmarks in my files. Like so:</p>
  
  <pre><code>start =
      expression
  
  validchar = 
      [0-9a-zA-Z_?!+\-=@#$%^&amp;*/.]
  
  integer = 
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
      digits:[0-9]+
          { return digits.join(""); }
  =======
      sign:"-"* digits:[0-9]+
          { return sign + digits.join(""); }
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; gh-pages
  </code></pre>
  
  <p>The files have been edited not by me and show lines inserted with: </p>
  
  <ul>
  <li>HEAD after less than signs (<code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</code>)</li>
  <li>lines of changed code </li>
  <li>a string of equals signs (<code>=======</code>)</li>
  <li>the new version of the code</li>
  <li>another line starting with greater than signs and the name of the branch (<code>&gt;&gt;&gt;&gt;&gt;&gt;&gt; gh-pages</code>)</li>
  </ul>
  
  <p>What's worse is that the file contents are no longer in order. Does anyone know how I get those files back to normal, and the changes I made in the gh-branch merged into the master branch?</p>