fix merge conflicts from develop

packages/medusa/src/subscribers/order.js

@@ -53,8 +53,9 @@ class OrderSubscriber {
 
     await Promise.all(
       order.discounts.map(async d => {
+        const usageCount = d?.usage_count || 0
         return this.discountService_.update(d.id, {
-          usage_count: d.usage_count + 1,
+          usage_count: usageCount + 1,
         })
       })
     )