add merge
merge with no-ff
fix bug 101
merged bugfix 101
stash test
merge from dev branch