branch 1
commit 2
commit master
commit all
commit dev
merge with no-ff