title: Update local branch from merge conflicts resolved in the Github UI
body: <p>I resolved some merge conflicts on the Github UI, but my local files are not showing these changes after a <code>git pull</code> or a <code>git fetch</code>.</p>
  
  <p>How do you update your local files to reflect merge conflicts resolved on the Github UI? </p>