Add a change to demonstrate auto-merging

episodes/08-conflicts.md

@@ -59,6 +59,7 @@ o - o <- HEAD, master, mummy-info
   - Verify with `git branch`
 - Edit the file `mars.txt` and commit the changes
   - Add a new sentence at the end of the file: `Mummy will appreciate sand storms on Mars`
+  - Adapt the first line and attach at its end: ` (for Dracula)`
   - Add & commit it: `git add mars.txt`, `git commit -m "Add advantages for the Mummy"`
   - Verify with `git graph`