untrashing users now removes their email or username if in conflict with another untrashed users
untrashing users now removes their email or username if in conflict with another untrashed users

punkave/apostrophe-people,punkave/apostrophe-people