solved merge conflict

packages/medusa/src/migrations/1622713782458-no_notification.ts

@@ -0,0 +1,11 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class noNotification1622713782458 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+    }
+
+}

packages/medusa/src/models/claim-order.ts

@@ -226,6 +226,8 @@ export class ClaimOrder {
  *   deleted_at:
  *     type: string
  *     format: date-time
+ *   no_notification:
+ *     type: boolean
  *   metadata:
  *     type: object
  */

packages/medusa/src/models/order.ts

@@ -417,4 +417,6 @@ export class Order {
  *     type: integer
  *   paid_total:
  *     type: integer
+ *   no_notification:
+ *     type: boolean
  */

packages/medusa/src/models/return.ts

@@ -168,6 +168,9 @@ export class Return {
  *     description: "The date with timezone at which the resource was last updated."
  *     type: string
  *     format: date-time
+ *   no_notification:
+ *     description: "When set to true, no notification will be sent related to this return."
+ *     type: boolean
  *   metadata:
  *     description: "An optional key-value map with additional information."
  *     type: object

packages/medusa/src/models/swap.ts

@@ -227,6 +227,9 @@ export class Swap {
  *     description: "The date with timezone at which the resource was last updated."
  *     type: string
  *     format: date-time
+ *   no_notification:
+ *     description: "If set to true, no notification will be sent related to this swap"
+ *     type: boolean
  *   metadata:
  *     description: "An optional key-value map with additional information."
  *     type: object