adding implementation details on how to handle syncing conflicts