Fix handling of add-people action

We can't use the list of nicks that comes with the event as it might
contain nick conflicts. Instead figure out which users were added from
the channel data after conflicts have been resolved.
Properly resolve nick conflicts when adding new flow