resolve conflits

src/shared/_mock/_shipping.ts

@@ -23,7 +23,7 @@ const generateShippingMethods = (): ShippingMethod[] => {
         switch (type) {
             case ShippingMethodType.FreeShipping:
                 methodData = {
-                    requires: RequiresFreeShipping.PromoCodeOrMinimumOrderAmount,
+                    requires: RequiresFreeShipping.PROMO_CODE_OR_MINIMUM_ORDER_AMOUNT,
                     minimumOrderAmount: 50,
                     applyMinOrderRuleBeforePromoCodeDiscount: true,
                 };
@@ -34,7 +34,7 @@ const generateShippingMethods = (): ShippingMethod[] => {
                     cost: 5,
                     costHeavyShippingClass: 10,
                     CostNoShippingClass: 3,
-                    calculationType: CalculationType.ByOrder,
+                    calculationType: CalculationType.BY_ORDER,
                 };
                 break;
             case ShippingMethodType.MondialRelay: