branch test
AND simple
& simple
conflict fixed
change
merge with no-ff
add ignore file