Fixed tree diff / merge.