title: Not getting GitHub merge conflicts Top-bar in Visual Studio Code
body: <p>I am having trouble getting this GitHub merge conflict Top-bar to resolve the conflicts in Visual Studio Code.</p>
  <p>I have tried adding this command <code>&quot;editor.codeLens&quot;: true</code> but no effect.</p>
  <p>This is what I am getting after pulling the changes <a href="https://i.stack.imgur.com/m62Pt.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/m62Pt.png" alt="enter image description here" /></a></p>
  <p>And this is what I want after pulling.
  <a href="https://i.stack.imgur.com/3LHK1.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/3LHK1.png" alt="enter image description here" /></a></p>
  <p>I am using VS Code 1.70.1</p>