We need a package which will consist of at least two main components:

Conflict detection:

Provide the ability for a server to detect if a conflict has occurred

Conflict resolution:

Provide the ability for a server to resolve the error and return the correct data to the client.

We should probably implement some form of custom error also which the client can use to act on conflicts.