Fix errors from bad git merge.