update merge error