handle merge error