git merge conflict filled icon