add branch test
quick and simple
quick & simple
conflict fixed
add merge with --no-ff
merge with no-ff
fix bug 101
merge issue 101