synced the conflict