Use Daniel's read-tree in the merge strategy 'resolve'.