You can merge contacts, does that solve the issue? Edit one of the contacts, tap the titlebar and then choose merge contact. Select the other version from the list of contacts and watch the merge happen.