Update people.txt
fix merge