Fixed merge conflics

packages/medusa/src/models/schemas/shipping-method.js

@@ -1,6 +1,7 @@
 import mongoose from "mongoose"
 
 export default new mongoose.Schema({
+  name: { type: String, default: "" },
   provider_id: { type: String, required: true },
   profile_id: { type: String, required: true },
   price: { type: Number, required: true },

packages/medusa/src/services/cart.js

@@ -968,6 +968,21 @@ class CartService extends BaseService {
       update.shipping_methods = []
     }
 
+    //if (cart.items.length && cart.payment_sessions.length) {
+    //  update.payment_sessions = await Promise.all(
+    //    region.payment_providers.map(async pId => {
+    //      const data = await this.paymentProviderService_.createSession(pId, {
+    //        ...cart,
+    //        ...update,
+    //      })
+    //      return {
+    //        provider_id: pId,
+    //        data,
+    //      }
+    //    })
+    //  )
+    //}
+
     // Payment methods are region specific so the user needs to find a
     // new payment method
     if (!_.isEmpty(cart.payment_method)) {