git merge conflict fill icon