title: Git how to remove conflict markers from files?
body: <pre><code>&gt;&gt;&gt;&gt;&gt;&gt;&gt; master
        .row
          - @power.next_invoice.tap do |invoice|
  
          %p
            = link_to t(".postings"), postings_path
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
      .span9{style: 'margin-top: 50px;'}
  =======
      .span9
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; master
  </code></pre>
  
  <p>Somehow these master and head comments/code have been added all over my code in all files.
  How do I remove them?</p>