branch test
and simple
 and simple
& simple
all right
add merge
merge eithout no-ff
fix a bug