git merge conflict sharp icon