branch test
AND simple
& simple
conflict fixed
l
k
add merge
merge with no-ff
l