users show page created
merge conflict fixed