AND simple
change the last line too
 Simple ? simple
conflict fixed
merge two conflicts