git merge conflict duotone thin icon