Make description of conflict example more clear

lectures/git/slides.qmd

@@ -274,7 +274,7 @@ git commit
 
 ## Hands-on session {background-color=var(--dark-bg-color) .leftalign}
 
-1. Create `file.txt` in two different branches with different content
+1. Create `file.txt` in two different branches with different content^[Make sure to **commit** the changes in each branch]
 2. Merge both branches into `main` (`CONFLICT`)
 3. Resolve the conflict and commit your changes