add create line...
and simple
AND simple
conflict fixed