Clarified conflict resolution for non-CvRDTs