ADD simple
& simple
conflict fixed
add merge