branch test
branch practice
AND smple
&simple
conflict fixed
add merge
merge with no-ff
add merge
merge with no-off
fix bug 101
merged bug fix 101