Implement better highlighting for merge conflicts

[dzsi1994]

Merge conflict is something that unfortunately we (developers) have to face quite often. A merge conflict can be really challenging to solve. In order to that, in my opinion the cobalt2 theme could improve to help developers fix conflicts more easily. For instance add diff background colors to highlight the currect and incoming change.

[wesbos]

Are you referring to VS code or sublime?

[dzsi1994]

I am referring to VS code! I need to change from cobalt2 theme to another theme every time I have conflicts because other themes have much better UI/UX in regards to highlight the merge conflicts.

[ItamarShDev]

Same here
it is the only think keeping me away from the theme.

[wesbos]

Anyone want to submit a PR? Maybe justnpull the styles from another theme?