git merge conflict duotone icon