Resolve conflicts in the user show page. Still tracking down bugs for adding new inspirations