fixed merge conflict on user show page