branch test
add simple
& simple
conflict fixed
add brach
merge with no-ff
fix bug 101
merged but fix 101