add simple
conflict fixed