blerg user show page dumb change
merge conflict resolved on user show page