proper loading for contacts
resolved conflicting changes