Recently VSCode settings sudden changed because of VS Code merge conflict and showing the yellow square on picture.
Issue is basically seen because of VS Code merge confliction and showing the yellow squares on pictures.
To Solve the error, Change the ‘Git Merge Editor’ settings, Go to Settings ->> User Settings ->> Search ‘Git Merger Editor’ and Disable ‘Git Merger Editor’ and error VSCode merge conflict with yellow square would be solved.
Alternatively you can change ‘Git Merge Editor’ settings by using command “diffEditor.codeLens”: true, “git.mergeEditor”: false and error VSCode merge conflict with yellow square would be solved.
"diffEditor.codeLens": true,
"git.mergeEditor": false