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