branch test
branch test
AND simple
& simple
conflict fixed
add merge
merge wuith no-ff