dev branch add file
branch test file
master branch
merge branch
add merge
merge dev with no-ff
git stash commit
merged bug fix 110