branch test
dev1 commit
master commit
dev1 commit
dev1 commit
master commit
conflict fixed
add merge
merge with no-ff
fast forward
Merge branch 'dev'