Highlight VCS conflict markers