phonebook - conflict resolver fixed