fix spacing for conflictPres

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

@@ -4,6 +4,7 @@
 
 * 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.
+* 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