mailmap: Coalesce some identities