& simple
sss
pppp
conflict fixed
add merge
merge with no-ff