branch test
and simple
& simple
confict fixed
something is strange
add merge
merge with no-ff
about BUG
fix bug 101
merged bug fix 101