branch test
add sth
merge with no-ff
fix bug 1001
merge bug from issue-1001