branch test
AND simple
& simple
conflict fixed
hello
hi
edit conflict
add merge
merge with no-ff
merge bob
michael 2
bob submit
merge with no-ff bob
commit
merge with no-ff
fix bug 101
merged bug fix 101