vim - add function to selectively highlight vcs conflict markers