git merge conflict sharp duotone icon