Fix a merge fail