Update people.rb

Solving conflict.