fixes merge conflicts, restores user show page