diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictIntro.md b/2019/2019-09-09_testCourseAdv/slides/conflictIntro.md
new file mode 100644
index 0000000000000000000000000000000000000000..8970946b00c0737ea3ea87f62fe041c6b6a57136
--- /dev/null
+++ b/2019/2019-09-09_testCourseAdv/slides/conflictIntro.md
@@ -0,0 +1,9 @@
+# Theory: Conflict resolution
+
+* A conflict emerges when two files push two different changes 
+to a one target branch
+
+* Some conflict may be resolved automatically, but major conflicts 
+always need to be resolved manually
+
+* Tools exist to streamline conflict resolutions, we use kdiff3
\ No newline at end of file