git merge conflict two tone icon