title: VSCode merge conflict options not displaying
body: <p>I am working on an application in which I have merged my code to the repository after taking the git pull.The problem is that earlier it was showing the options like <strong>accept current change</strong> , <strong>accept incoming change</strong>, <strong>accept both the changes</strong>. But now it is not showing the options now , I have taken the <strong>pull</strong> and <strong>stash poped</strong> my code but no I am stuck as I cannot proceed further.</p>
  <p><strong>Below are the snapshots for better understanding</strong></p>
  <p><a href="https://i.stack.imgur.com/9YgCz.png" rel="noreferrer"><img src="https://i.stack.imgur.com/9YgCz.png" alt="It is showing the options now" /></a></p>
  <p><a href="https://i.stack.imgur.com/gIDvx.png" rel="noreferrer"><img src="https://i.stack.imgur.com/gIDvx.png" alt="Not showing anywhere" /></a></p>
  <p><strong>Any solution please ?</strong></p>