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