Fix a silly merge.