created conflict
Merge branch 'myBranch'
another change
master conflict
fixed conflict
reinit
useless file
added usefull git commands