Splitting DataSync Roadmap into confict resolution and sync.

Just splitting the roadmap into two separate roadmaps.