Correct a mistake during merge