correct merge error