remove remnant git merge annotation