Add users.
Resolve conflicts.