Online grocer and its Norwegian rival had been embroiled in an intellectual property dispute