Fixed up a git merge mistake.