title: An error was raised by libgit2. Category = 21 (MergeConflict)
body: <p>I am using VS 2013.</p>
  
  <p>I am stuck.  Everything is committed to my local repository.  I try to pull from remote and I get the following error: </p>
  
  <p><em>An error occurred. Detailed message: An error was raised by libgit2. Category = 21 (MergeConflict).
  1 uncommitted change would be overwritten by merge</em></p>
  
  <p>I have no uncommitted changes...that I'm aware of.</p>