git merge conflict sharp two tone icon