Add me to .mailmap and remove duplicate name