git merge conflict outline thin icon