branch test
and simple
& simple
conflict fixed
!!
merge with no-ff
n
dev
dev2
master2
merge
master3
dev3
mer
ma1
dev1
ma1
fine
com