Correct merge error