new branch
branch test
main simple
conflict fixed
nothing
AND simple
& simple
and simple
add merge
merge with no-ff