vcard update fix
conflict fix