Fix a mistake during merge