Fix a merge conflict I missed.