Remove some git merge garbage.