branch test
and simple
simple
& simple
add merge
merge with no-ff
bug 101
bug 101