Synchronization now handles conflicting entries.