W-21241548: resolve conflicts

Author: rvishwanathbhat

packages/commerce-sdk-react/src/hooks/types.ts

@@ -8,6 +8,8 @@ import {InvalidateQueryFilters, QueryFilters, Updater, UseQueryOptions} from '@t
 import {
     ShopperBaskets,
     ShopperConfigurations,
+    ShopperBasketsV2,
+    ShopperContexts,
     ShopperCustomers,
     ShopperExperience,
     ShopperGiftCertificates,