Fix build failures after merge conflict resolution

Author: itsmeichigo

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/WooShippingSplitShipmentsDetailView.swift

@@ -34,9 +34,11 @@ struct WooShippingSplitShipmentsDetailView: View {
                                 .foregroundStyle(Color(.textSubtle))
                         }
 
-                        VStack(spacing: Layout.verticalSpacing) {
-                            ForEach(viewModel.shipmentCardViewModels) { item in
-                                CollapsibleShipmentCard(viewModel: item)
+                        if let shipment = viewModel.currentShipment {
+                            VStack(spacing: Layout.verticalSpacing) {
+                                ForEach(shipment) { item in
+                                    CollapsibleShipmentCard(viewModel: item)
+                                }
                             }
                         }
                     }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/WooShippingSplitShipmentsViewModel.swift

@@ -127,7 +127,7 @@ private extension WooShippingSplitShipmentsViewModel {
 
     func showMoveToNotice() {
         let selectedItemsCount = {
-            shipmentCardViewModels.map { $0.selectedShipmentIds.count }.reduce(0, +)
+            currentShipment?.map { $0.selectedShipmentIds.count }.reduce(0, +) ?? 0
         }()
 
         guard selectedItemsCount > 0 else {