I think the next logical step for conflict resolution would be to support some level of user control to decide which of the tuples to use (local or remote). We can even allow the administrator to merge both tuples as long as the resulting merged is the same on all nodes.
For ergonomics it would be nice to support external conflict resolution by calling out to some user defined function passing in both local and remote data and letting the user product the new value that would be updated to the local system.
I personally would have a use-case for this feature :)