Update People.java
2nd merge