Mac OS X 10.4 Help
Using Conflict Resolver
Occasionally when synchronizing the information on your computer, Mac OS X synchronization services may discover two or more different copies of the same record on .Mac, on your computer, or on one of your devices. This can occur for instance if you change a contact's name in your cell phone from "John" to "Jon" as well as change the name for that same person from "John" to "Jonathan" on your computer. In this case, .Mac synchronization services presents the Conflict Resolver and asks you which of these changes you wish to keep. The versions are identified by their location (e.g. .Mac, iPod, or Address Book), and a list of conflicting changes are provided for each record.
You can choose to review the conflicts now or later. If you choose to review the conflicts later, you can access the Conflict resolver using the Sync Services status menu in the menu bar. The Sync Services status menu will change to an alert icon to warn you of conflicts. Clicking on Sync Services Status menu will display the number of records currently in conflict, as well as provide you a way to launch the Conflict Resolver and resolve these conflicts.