Fix some errors created by git merge.