[m] correct merge error code