update correct merge error