diff --git a/04-merge-conflicts.md b/04-merge-conflicts.md
index 809e4235d348a35eba52ee6101e4ac1fd6b67f0d..526520ba2147c47de1461b000964ba0cb7f01b4c 100644
--- a/04-merge-conflicts.md
+++ b/04-merge-conflicts.md
@@ -29,21 +29,16 @@ git checkout master
 git pull origin master
 ```
 
-### 2. Create a new branch to work on the code with conflicts. You can use the review number and patchset as name
+### 2. Fetch the patch and create a new branch to work on the code. You can use the review number and patchset as name
 
-```bash
-git checkout -b <review-number>-<patchset>
-```
-
-### 3. Pull the patch on the created branch
-
-(To find the command to execute you can open the corresponding change page on Gerrit UI, click on download menu, then copy the `pull` command.)
+(To find the command to execute, you can open the corresponding change page on Gerrit UI, click on download menu, then copy the `Checkout` command.)
 
 ```bash
-git pull <url> <ref>
+git fetch <url> <ref> && git checkout FETCH_HEAD
+git switch -c <review-number>-<patchset>
 ```
 
-### 4. Make a rebase of your branch against master
+### 3. Make a rebase of your branch against master
 
 **Note**: use the appropriate branch instead of master
 
@@ -51,9 +46,9 @@ git pull <url> <ref>
 git rebase master
 ```
 
-### 5. Fix all conflicts that cannot be resolved manually using your editor
+### 4. Fix all conflicts that cannot be resolved manually using your editor
 
-### 6. Add all updated files to the index
+### 5. Add all updated files to the index
 
 ```bash
 git add <file>
@@ -65,13 +60,13 @@ git add <file>
 git status
 ```
 
-### 7. Continue the rebase process using the following command
+### 6. Continue the rebase process using the following command
 
 ```bash
 git rebase --continue
 ```
 
-### 8. Submit your change back to the repository
+### 7. Submit your change back to the repository
 
 **Note**: use the appropriate branch instead of master