branch test
AND simple
& simple
conflicts fixed
add merge
merge on-ff