[ remove git merge conflict chars ]