branch test
AND simple
& simple
conflict fixed
add dev merge
merger with no-ff