parallel edition continued
detection of conflicts
merging values