Add handling for sync conflicts.