Strangely, the merge conflict decorators are not appearing in vscode. My "merge conflict > decorators" setting is "enabled", so I am really confused why it is not working. This happened when I installed vscode on my windows computer from scratch. Please let me know what yoy think?
