3. The method of claim 2 , further comprising identifying the editing conflict to distinguish the editing conflict from the non-conflicting content.
5. The method of claim 3 , wherein hiding the editing conflict comprises removing identification of the editing conflict.