Fix a typo in the merge.