Resolve conflict DataIO vs SIO