branch test
and simple
& simple
confict fixed
add a new line
merge with no ff
AND simple
& simple
fix