title: Git says a file is unmerged and I can't commit, but the file seems to be merged
body: <p>I had about 12 file conflicts when I merged branches. I manually fixed all the conflicts and staged the files. But now when I try to commit, it says one of the files is unmerged.</p>
  
  <pre><code>U      app/models/disclosure_event.rb
  fatal: 'commit' is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;' as
  appropriate to mark resolution and make a commit, or use 'git commit -a'.
  </code></pre>
  
  <p>When I type <code>git status</code>, it shows all the changed files, including "disclosure_event.rb", under <code>Changes to be committed</code>. It shows no files as unstaged. I've repeatedly tried to add the file, but it seems to do nothing. If I open the file, everything looks great.</p>
  
  <p>Any ideas? I'm completely stuck.</p>