conflict ex
will be conflict
conflict resovled
commit b2
merge with no-ff
check git stash
dev branch
Merge branch 'dev'
master edit