branch test
AND simple
& siample
conflict fixed
add merge
merge with no-ff
fix bug 101
megred bug fix 101