ConflictFreeLog: fix conflict resolution