iResolve merge  conflict