title: Vscode merge conflict with yellow square
body: <p>somehow my vscode changed, when i want to resolve merge conflict,there is something like &lt;&lt;&lt;&lt;HEAD , but now it's like a yellow square on picture, why is that? can anyone tell me why?</p>
  <p><img src="https://i.stack.imgur.com/sDi7M.png" alt="enter image description here" /></p>