diff --git a/.mailmap b/.mailmap
index 2788438f46..8b13789179 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,39 +1 @@
-Adam Bradley <adambradley25@gmail.com> <adamdbradley@users.noreply.github.com>
-Albert Martin <albert@bethel.io> <albert@imor.tl>
-Alejandro López <a.lopez.sanchez@outlook.es> <a.lopez.sanchez@udc.es>
-Andrew Joslin <andrewtjoslin@gmail.com> Andrew <andrewtjoslin@gmail.com>
-Andrew Joslin <andrewtjoslin@gmail.com> Andrew <andytjoslin@gmail.com>
-Andrew Joslin <andrewtjoslin@gmail.com> <andytjoslin@gmail.com>
-Bevan Rudge <bevan@js.geek.nz> <BevanR@users.noreply.github.com>
-Brandon Van Noy <brandom.v@gmail.com> <bvannoy@medfusionsvs.com>
-Caleb Eggensperger <calebegg@google.com> <calebegg@gmail.com>
-Carlos Lopez Jr <clshortfuse@gmail.com> Carlos Lopez <clshortfuse@gmail.com>
-Carlos Lopez Jr <clshortfuse@gmail.com> clshortfuse <clshortfuse@gmail.com>
-Ed Pelc <ed@freightchick.com> <epelc@greatcloak.com>
-Elad Bezalel <elad.bezalel@gmail.com> <Elad.bezalel@gmail.com>
-Erin Coughlan <ecoughlan@google.com> <ErinCoughlan@users.noreply.github.com>
-Frank Meyer <frankymeyer@gmail.com> <FrankyMeyer@gmail.com>
-Frank3K <Frank3K@users.noreply.github.com> Frank <Frank3K@users.noreply.github.com>
-Georgios Kalpakas <kalpakas.g@gmail.com> <g.kalpakas@hotmail.com>
-Hans Larsen <hans@hansl.ca> Hans <hans@hansl.ca>
-HosseiN Khademi Khaledi <hossein.khaledi@yahoo.com> <hosseinkhaledi@users.noreply.github.com>
-Jeremy Elbourn <jelbourn@google.com> <jelbourn@gmail.com>
-Jeremy Elbourn <jelbourn@google.com> Jeremy <jelbourn@gmail.com>
-Jesse Palmer <jesse.l.palmer@gmail.com> <jesselpalmer@gmail.com>
-Justin Emge <jmemge@google.com> <jmemge@hotmail.com>
-Kara Erickson <karakara@google.com> Kara <kara@users.noreply.github.com>
-Kristiyan Kostadinov <crisbeto@users.noreply.github.com> crisbeto <crisbeto@abv.bg>
-Marcy Sutton <marcy.sutton@deque.com> Marcy Sutton <marcy@substantial.com>
-Marcy Sutton <marcy.sutton@deque.com> marcysutton <holla@marcysutton.com>
-Matthew Findley <findlmat@gmail.com> <findley@substantial.com>
-Michael Prentice <splaktar@gmail.com> Michael Prentice <mprentic@harris.com>
-Michael Prentice <splaktar@gmail.com> Splaktar <splaktar@gmail.com>
-Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
-Miles Malerba <mmalerba@google.com> mmalerba <mmalerba@google.com>
-Naomi Black <naomib@google.com> Naomi Black <naomiblack@users.noreply.github.com>
-Naomi Black <naomib@google.com> Naomi Black <naomitraveller@gmail.com>
-Paul Gschwendtner <paulgschwendtner@gmail.com> <paulgschwendtner@me.com>
-Robert Messerle <robertmesserle@gmail.com> <rmesserle@google.com>
-Thomas Burleson <ThomasBurleson@gmail.com> Thomas Burleson <ThomasBurleson@Gmail.com>
-Topher Fangio <topher@profoundry.us> <fangiotophia@gmail.com>
-Ty Potter <tyler.john.potter@gmail.com> <typotter@google.com>
+