users detail page
fixed merge conflict