Added a new person to file
Fixed merge conflict