.mailmap: merge duplicate committers