correct ex-merge error