title: How to resolve Git merge conflict
body: <p>I am new with github and am trying to merge my master and gh-pages branches.</p>
  
  <p>While trying to merge, I had a conflict. Now I get the following message</p>
  
  <p><img src="https://i.stack.imgur.com/AH2cm.png" alt="enter image description here"></p>
  
  <p>How do I fix it?</p>