a more robust merge script

When we can't look up a user's name or email the script fails. This will cause it to default to the user's login.