MongoNodeState nodeState = (MongoNodeState)entry.getValue();
stagedNode.addChildNodeEntry(nodeState.unwrap());
}
}
for (String name : ourChanges.getRemovedChildNodes().keySet()) {
stagedNode.removeChildNodeEntry(name);
}
List<Conflict> conflicts = theirChanges.listConflicts(ourChanges);
// resolve/report merge conflicts
for (Conflict conflict : conflicts) {