OC-1701: Conflict detected in keep-in-sync