AND simple
& simple
conflict fixed
line1
line2
fixed