trying to show all person
correcting merge conflict