fix: Merge conflicts with master

integration-tests/plugins/__tests__/medusa-plugin-sendgrid/__snapshots__/index.js.snap

@@ -576,7 +576,7 @@ Object {
             "note": null,
             "quantity": 1,
             "reason_id": null,
-            "received_quantity": null,
+            "received_quantity": 1,
             "requested_quantity": 1,
             "return_id": Any<String>,
           },
@@ -724,7 +724,7 @@ Object {
         "note": null,
         "quantity": 1,
         "reason_id": null,
-        "received_quantity": null,
+        "received_quantity": 1,
         "requested_quantity": 1,
         "return_id": Any<String>,
       },