1. A method of collaboratively authoring a data file, comprising: displaying the data file; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; displaying an accept control and a reject control when the editing conflict is selected; and allowing the user to select the accept control, resulting in accepting the editing conflict, and the reject control, resulting in rejecting the editing conflict.