and sinple
&simple
conflict fixed