branch test
and simple
& simple
confilict fixed
add merge
merge with no-ff
fix bug 101
merged bug 101