Add highlighting for git merge conflict files.