and simple
&simiple
conflict fixed