title: Git: Merge Head exists message despite not having any commits staged.
body: <p>So when i'm trying to do </p>
  
  <pre><code>git pull origin master
  </code></pre>
  
  <p>to update my local branch, I get this message: </p>
  
  <pre><code>You have not concluded your merge (MERGE_HEAD exists).
  Please, commit your changes before you can merge.
  </code></pre>
  
  <p>but when I do </p>
  
  <pre><code>git status
  </code></pre>
  
  <p>I don't see any changes staged for commit. I only see a list of changes not staged for commit and untracked files. Any suggestions of what I can do to make this pull successful? Thanks! </p>