add simple
add &simole
conflict fixed