Merge branch 'branch_conflict' into 'master'

Add a section on Merge conflicts

See merge request !3

README.md

@@ -2,7 +2,8 @@ This is an example Repository
 =============================
 
 You can use [Markdown](https://confluence.atlassian.com/display/STASH038/Markdown+syntax+guide) 
-to make a nice readme file for other users which includes
+to make a nice readme file for other users explaining the content of the
+repository which includes
 
 1. ordered lists
 2. unordered lists, for example
@@ -20,7 +21,9 @@ editors and for basic things it's very easy to use:
 | row2, col1 | row2, col2 |
 
 
-Add a subsection
-----------------
+Merge Conflicts
+---------------
 
-You can easily add subsections to the readme
+Merge conflicts happen if more then one commit try to edit the same part of the
+same file. Git is rather good in trying to avoid them but it cannot do this all
+the time.