branch test
append AND simple
append & simple
conflict fixed
another
merge with no-ff
fix bug 101.1