Sync for conflict solving