git merge conflict duotone regular icon