title: Git merge conflict, but there is no visible difference
body: <p>I often get conflicts when merging branches that look like this:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
      private readonly IAdminService _adminService;
  
  =======
      private readonly IAdminService _adminService;
  
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; refs/remotes/origin/master
  </code></pre>
  
  <p>There is no visible difference. What would cause github to view this as a conflict?</p>