Splitting DataSync Roadmap into confict resolution and sync.