branch test
and simple
& simple
confict fixed
add merge2
merge with no-ff
repair bug
merge bug fix 101