branch test
simple branch b1
master
conflict fixed
dev
no ff
fix bug 1
merge after bug-1