fix: merge conflicts with master

docs/content/add-plugins/strapi.md

@@ -28,26 +28,27 @@ First, create a Medusa project using your favorite package manager. You can go a
 `npx create-medusa-app` will allow you to create a Medusa store engine, a storefront, and Medusa admin in a single command
 
 ```bash
-# using npx
 npx create-medusa-app
+```
 
-# using yarn
+Alternatively, using Yarn:
+
+```bash
 yarn create medusa-app
 ```
 
 > When choosing `npx` you are shown different store engine options as part of the setup. For this Strapi tutorial, you should choose `medusa-starter-default`. Optionally, pick a storefront.
 
 **Use `medusa-cli`**
-`@medusajs/medusa-cli` is our Command Line Tool for creating the Medusa store engine (alongside many other powerful commands). Use it as such:
+`@medusajs/medusa-cli` is our Command Line Tool for creating the Medusa store engine (alongside many other powerful commands). First, install it:
+
+```bash npm2yarn
+npm install @medusajs/medusa-cli -g
+```
+
+Then, initialize a Medusa project:
 
 ```bash
-# using yarn
-yarn global add @medusajs/medusa-cli
-
-# using npm
-npm install -g @medusajs/medusa-cli
-
-# initialise a Medusa project
 medusa new my-medusa-store
 ```
 
@@ -87,22 +88,14 @@ Additionally, add Strapi to your list of plugins:
 
 And finally, install the plugin using your package manager:
 
-```bash
-#using yarn
-yarn add medusa-plugin-strapi
-
-# using npm
+```bash npm2yarn
 npm install medusa-plugin-strapi
 ```
 
 You've now successfully installed and configured your Medusa store engine. Seed it with data and start it up by running:
 
-```bash
-# using npm
-npm run seed && npm start
-
-# using yarn
-yarn seed && yarn start
+```bash npm2yarn
+npm run seed && npm run start
 ```
 
 We'll now turn to the Strapi side of things.
@@ -111,13 +104,16 @@ We'll now turn to the Strapi side of things.
 
 Similar to how you installed Medusa, you can install Strapi using your favorite package manager. Use the `strapi-medusa-template` to create your project. The template is a custom Strapi implementation required for the two systems to work together.
 
+You can use NPX:
+
 ```bash
-# using npx
 npx create-strapi-app@3.6.8 strapi-medusa --template https://github.com/Deathwish98/strapi-medusa-template.git
+```
 
-# using yarn
+Alternatively, using Yarn:
+
+```bash
 yarn global add create-strapi-app@3.6.8
-
 create-strapi-app strapi-medusa --template https://github.com/Deathwish98/strapi-medusa-template.git
 ```