Merge branch 'master' of github.com:LaurentDan/test into b1
change made to master.txt from b1
Merge branch 'master' of github.com:LaurentDan/test into b2
change made to master.txt by b2
Merge branch 'master' of github.com:LaurentDan/test into b1
Merge branch 'b2'
merge with b1 resolve confilcts
master.txt conflicts resolved