git merge conflict duotone bold icon