diff --git a/git-tutorial.tex b/git-tutorial.tex
index 5bd6100010633b4f3be4baf8ad6bc904756552cc..31da1715d1554c4dc4d6a35de6b97cce2b0f9cf5 100644
--- a/git-tutorial.tex
+++ b/git-tutorial.tex
@@ -409,7 +409,9 @@ the file given as argument.
 
 \subsubsection*{merge}
 \label{merge}
-
+Sometimes it happens that merge conflicts are introduced, the most
+common occasion is when two users happen to edit the same lines of a
+file.