CRDTs: Making Collaboration Conflict-Free