AND simple
& simple
conflict fixed
add a new line