4f620f537e
* Use a unique ID the date nodes in the HTML tree to be able to find the current node. * Look for nodes in the same tree "leaf" and work on conflicts in this single leaf/branch.