[Solved] Vscode merge conflict
Github
Mohit Mozumder

Problem:
I dont know how my vscode changed, when i want to resolve merge conflict,there is something like
<<<<Head & yellow square
Solution:
To solve this issue just disable Git: Merge Editor
Go to settings -> then "Git Merge Editor" ->now disable "Git: Merge Editor"
Thank you for reading the article. If you face any further issue feel free to contact with us.