git merge conflict outline regular icon