create conflictIntro

2019/2019-09-09_testCourseAdv/slides/conflictIntro.md

+# 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