add simple\
& simple
conflict fixed
add merge