branch test
ADD simple
& simple
conglict fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101
ok
merge with no-ff