Adding more people
Resolving conflict