Fix a conflict that I didn't notice