Fix bug in pull request merge.