SyncConflict refactoring