And remove git merge messages, fixing the manual merge.