Read a paper on CRDTs today. Conflict resolution is one of those problems that sounds simple until you actually sit with it.