fix git merge arrows