We need to have a clear under standing of where conflict resolution and subscriptions fit together in our solution. What does the conflict resolution flow look like once subscriptions are introduced.

Some things to consider:

Cached data with subscriptions incoming
Queue'd data and how we handle the inevitable conflict they will produce once replayed