user show
removed old form
Merge Conflict fix