WIP: resolve duplicate matches to the best available match

In the case where we discover that there is another contact whose
address matches a previously resolved event, update the event to
use the contact whose address is the better match.