21. The method of claim 20 and wherein said resolving comprises: displaying said difference tree hierarchy for manual version resolving; presenting a display of at least one current state of a merged page; displaying the values of a component attribute, including displaying the two values for components for which there is a comparison node; selecting and coordinating between said displaying said difference tree hierarchies, said presenting and said displaying the values of a component attribute; providing the combined results from said displaying said difference tree browser, said presenting and said displaying the values of a component attribute; and generating a new resolved difference tree.
21. The method of claim 20 and wherein said resolving comprises: displaying said difference tree hierarchy for manual version resolving; presenting a display of at least one current state of a merged page; displaying the values of a component attribute, including displaying the two values for components for which there is a comparison node; selecting and coordinating between said displaying said difference tree hierarchies, said presenting and said displaying the values of a component attribute; providing the combined results from said displaying said difference tree browser, said presenting and said displaying the values of a component attribute; and generating a new resolved difference tree. 22. The method of claim 21 and wherein said presenting a display of at least one current state of a merged page comprises animating the display of conflicting said components by switching between said at least one states.