/branchtest

review ...
add sth to go on.
branch test
test by ms
test no-ff mode
test stash