add merge
merge with no-ff
bug fixed
merge bug fixed
dev is developed
merge dev stash