chore(workflows): Fix merge conflicts with master

packages/medusa-react/README.md

@@ -25,7 +25,7 @@ In addition, because medusa-react is built on top of react-query, you can pass a
 
 import * as React from "react"
 import { QueryClient } from "react-query"
-import { MedusaProvider } from "../src"
+import { MedusaProvider } from "medusa-react"
 import MyStorefront from "./my-storefront"
 
 // Your react-query's query client config

packages/medusa/src/models/customer.ts

@@ -100,7 +100,7 @@ export class Customer extends SoftDeletableEntity {
  *     example: Arno
  *   last_name:
  *     type: string
- *     description: The customer's first name
+ *     description: The customer's last name
  *     example: Willms
  *   billing_address_id:
  *     type: string