branch deev
add simple
&& simple
conflict fixed