AND simple
& simple
conflict fixed
change file
merge with no-ff