phonebook - added conflict resolver