title: Merge conflict in .gitignore
body: <p>I have 2 branches, <code>master</code> and <code>newfeature</code>. When I want to merge <code>newfeature</code> into <code>master</code>, I used:</p>
  
  <pre><code>git checkout master
  git merge newfeature
  </code></pre>
  
  <p>I get the error:</p>
  
  <pre><code>Auto-merging .gitignore
  CONFLICT (content): Merge conflict in .gitignore
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>I opened up <code>.gitignore</code> and it looks like a mess now with the last part of the file looking like</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  public/img/ignore
  =======
  public/img/profiles
  public/blog
  public/recommendation
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; newfeature
  </code></pre>
  
  <p>What happened, and how should this be fixed so that I can merge the branch into <code>master</code>?</p>