barnch test
simple
simple
conflict fixed
add merge
merge with --no-ff
fix 101
merge bug 101