After setting a new identity key as trusted, we retry decryption on all pending conflicts for that contact. If their identity changed twice in a row, we can still get a conflict the second time, and should handle it appropriately.