6. The method of claim 5 , wherein annotating the identified editing conflict comprises displaying an origin of the identified editing conflict.
5. The method of claim 4 , wherein displaying the identified editing conflict comprises annotating the identified editing conflict to distinguish the identified editing conflict from the non-conflicting content.