cloud_resolve_conflicts
