Fix a merge issue.