merge with no-ff
Merge branch 'dev'
change :delete a
merge issue-101
Test git stash