icons added to people
merge conflicts