branch test
and simple
 & simple
conflict fixed
add test
merge with no-ff