diff --git a/git_beginner/_build/latex/gitintro.pdf b/git_beginner/_build/latex/gitintro.pdf
index f272f97095ac2ba410f1d3db86281599cac3aa74..3d4f0cbe481f93466c172e9d167916a007909a94 100644
Binary files a/git_beginner/_build/latex/gitintro.pdf and b/git_beginner/_build/latex/gitintro.pdf differ
diff --git a/git_beginner/_static/repo_distributed.png b/git_beginner/_static/repo_distributed.png
index 3763b559204f8896b34f0ceb085a65a5509d5cc7..ec1dc64619bdfb1d802aabe42a9cf551c08df5b2 100644
Binary files a/git_beginner/_static/repo_distributed.png and b/git_beginner/_static/repo_distributed.png differ
diff --git a/git_beginner/_static/repo_single.png b/git_beginner/_static/repo_single.png
index 7a7da78989ef0ee1966f84dc940790e6ce8a0eb4..57dd09ff1177c0c4d7933a37000efedd16488db1 100644
Binary files a/git_beginner/_static/repo_single.png and b/git_beginner/_static/repo_single.png differ
diff --git a/git_beginner/introduction.rst b/git_beginner/introduction.rst
index 8b6f766027561c76c6e777869f9b9384ded8199d..9b92c0b853a07e959d6e175c622ec4269e6a3356 100644
--- a/git_beginner/introduction.rst
+++ b/git_beginner/introduction.rst
@@ -83,10 +83,12 @@ and it's also incredibly useful when looking at the history and commit log: ::
  git config --global user.email johndoe@embl.de
 
 
-Other useful settings include your favorite editor as well as difftool: ::
+Other useful settings include your favorite editor, enabling color output as
+well as difftool: ::
 
  git config --global core.editor nano
- git config --global merge.tool meld
+ git config --global color.ui auto
+ git config --global merge.tool kdiff3
 
 
 
@@ -352,9 +354,10 @@ status) try to get the changes we've done in the `mythesis-work` directory::
   git status
 
   git pull
-
-.. TODO: add output of git pull here
-
+  ...
+  Auto-merging paper.txt
+  CONFLICT (content): Merge conflict in paper.txt
+  Automatic merge failed; fix conflicts and then commit the result.
 
 
 Solving conflicts