diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
similarity index 74%
rename from 2019/2019-09-09_testCourseAdv/slides/conflictPresentation.md
rename to 2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
index 6e1d7ca43aa417c698d99164341f099fff621bee..0da1b19cb069c72509d2d6d0d2192a6541737699 100644
--- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation.md
+++ b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
@@ -4,4 +4,6 @@
 
 * Meanwhile a coworker changed that Micheal file in the develop branch
 
-* If you try to push your changes to that file into develop, you'll encounter a merge conflict, the system cannot know which change is now the one to keep.
\ No newline at end of file
+* If you try to push your changes to that file into develop, you'll encounter a merge conflict, the system cannot know which change is now the one to keep.
+
+* Usually done using `git diff` in bigger project this method quickly loses oversight
\ No newline at end of file
diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md
new file mode 100644
index 0000000000000000000000000000000000000000..39e19635b6ccbfdfce779d3775efbb7e88df9fcf
--- /dev/null
+++ b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md
@@ -0,0 +1,7 @@
+# Practical: Conflict resolution using kdiff3
+
+* When prompted with the merge conflict, open kdiff3 to check the affected files
+
+* Selecting A will keep the changes of the target branch, while B will keep your changes. Selecting A and B will combine both changes to the merged file.
+
+* We are only interested in your changes, so select B and save
\ No newline at end of file