User show and edit
conflict fix