and simple
&& simple
conflicts fixed