fix leftover git merge junk