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