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