diff --git a/git-crash-course.md b/git-crash-course.md
index fc3d888..a95d2a7 100644
--- a/git-crash-course.md
+++ b/git-crash-course.md
@@ -389,7 +389,11 @@ Partendo da master:
     $ git add file.txt
     $ git commit
 
-TODO: immagine con lo stato corrente
+<img style="width:300px" src="images/branch-conflict.png" data-action="zoom">
+
+-----
+
+## Risoluzione dei conflitti
 
 Mergiamo:
 
@@ -398,7 +402,7 @@ Mergiamo:
     $ git add file.txt
     $ git commit
 
-TODO: immagine con lo stato corrente
+<img style="width:300px" src="images/branch-conflict-solved.png" data-action="zoom">
 
 -----
 
diff --git a/images/branch-conflict-solved.odg b/images/branch-conflict-solved.odg
new file mode 100644
index 0000000..86f76bd
Binary files /dev/null and b/images/branch-conflict-solved.odg differ
diff --git a/images/branch-conflict-solved.png b/images/branch-conflict-solved.png
new file mode 100644
index 0000000..b8ff243
Binary files /dev/null and b/images/branch-conflict-solved.png differ
diff --git a/images/branch-conflict.odg b/images/branch-conflict.odg
new file mode 100644
index 0000000..9e70fc0
Binary files /dev/null and b/images/branch-conflict.odg differ
diff --git a/images/branch-conflict.png b/images/branch-conflict.png
new file mode 100644
index 0000000..332d162
Binary files /dev/null and b/images/branch-conflict.png differ