branch test
aaaa test for branch
md master
conflict fixed
aaaaa
merge with no-ff
fix bug 101
fixed bug 101 no-ff
time=09:31
fixed conflit2 9:34