recover merge error