branch test
AND simple
$ sample
conflict fixed
add merge
merge with no-ff
te
f