branch test
and simple
& simple
conflict fixed
add merge
merge with no-ff
 fix bug 1010
merge bug fix 1010