fixed user show page
fixed merge conflict