title: Git: can't commit a file even though I've resolved the conflict
body: <p>I pulled from <code>origin</code> to update my local, and one file had conflicting changes. I resolved the conflict, but I can't commit (locally) because git still thinks the file is conflicting:</p>
  
  <pre><code>$ git add style.css
  </code></pre>
  
  <p>This works - no errors or anything. Then:</p>
  
  <pre><code>$ git commit
  
  Merge branch 'dev' of [origin] into dev
  
  Conflicts:
          [path]/style.css
  #
  # It looks like you may be committing a MERGE.
  # If this is not correct, please remove the file
  #       .git/MERGE_HEAD
  # and try again.
  #
  </code></pre>
  
  <p>Why doesn't this work?</p>