branch test
AND simple
& simple
conflict fixed
add merger
merge with no-ff
fix bug 101
mergerd bug fix 101
deal with tail
aaaa
merge with no-ff