4. The method of claim 1 , further comprising providing the second change as the conflict comment in a display of the document.
4. The method of claim 1 , further comprising providing the second change as the conflict comment in a display of the document. 5. The method of claim 4 , wherein providing the second change as the conflict comment in the display of the document includes displaying the conflict comment in-line in the display of the document.