branch test
AND simple
& simole
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug gix 101