add simple
u
conflict fixed