branch test
and simple
& simple
conflict fixed
branch test2
merge with no-ff