git merge conflict line icon