git merge conflict sharp fill icon