title: Can't git pull because of unmerged files
body: <p>I'm still very new to git and trying to figure out how everything works. So here's my situation: I've been working on a java project on my laptop. Pushed onto git repository and pulled it on a different machine. Made some changes and pushed onto the repository. Now I want to pull my current work onto my laptop but it's saying I can't because I have unmerged files. </p>
  
  <pre><code>Pull 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;'
  </code></pre>
  
  <p>Please help on correcting this issue. Thank you.</p>
  
  <pre><code>$ git status
  on branch master
  Your branch is ahead of 'origin/master' by 1 commit.
    (use "git push" to publish your local commits)
  
  You have unmerged paths.
    (fix conflicts and run "git commit")
  </code></pre>