On: Offline First

[gizzlon]

So what happens if the client and server have a conflict? E.g. their versions of the data diverged..

These "merge conflicts" seems like something that must be handled in a custom way for many apps.