merge conflict highlighting