Added names for people.
Resolved merge conflict.