branch test
add brank
add master
conflict fixed
commit dev
merge with no-ff
commit issue-101
merge issue
add stash
merge stash
commit
merge