branch test
add a new line
& simple
conflict fixed
add merge
merge with no-ff