merge local versions