branch test
test on dev branch
edit on branch1
edit on master
conflict fixed
edit file on dev
merge with no fast-forwarrdd
fix bug_101
merged bug_101
test stash and edit on bash
Merge branch 'dev'