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