From VSCode, I see merge conflict diss color like this:  But on Emacs: 