title: How to resolve merge conflict in pull request in VSTS?
body: <p>I've created pull request I got into this:</p>
  
  <p><a href="https://i.stack.imgur.com/7KKqE.png" rel="noreferrer"><img src="https://i.stack.imgur.com/7KKqE.png" alt="enter image description here"></a></p>
  
  <p>"Approve" button does nothing and complete is disabled.</p>
  
  <p>How do I resolve this confligt in pull request?</p>