ready for no-ff
merge with no-ff
--no-ff mode
Merge branch 'dev'
bug fixed
merge bug fix 101
git stash function
Merge branch 'dev'