git merge conflict outline bold icon