1. A method of collaboratively authoring a data file comprising: identifying at a first authoring application implemented on a first computing device an editing conflict existing between a user copy of the data file and a master copy of the data file; merging the user copy of the data file and the master copy of the data file to generate a merged copy of the data file; displaying the merged copy of the data file to a user of the first authoring application; presenting to the user a toggle interface enabling the user to toggle between displaying the identified editing conflict and hiding the identified editing conflict, the toggle interface being presented when the editing conflict is identified and remaining until the identified editing conflict has been resolved, wherein the merged copy of the data file is freely editable by the user both when the identified editing conflict is displayed and when the identified editing conflict is hidden; and providing a resolution interface configured to present the user copy of the data file including displaying content locks and displaying user content annotated to indicate the identified editing conflict, the resolution interface enabling the user to provide resolution instructions for the identified editing conflict, wherein enabling the user to provide resolution instructions comprises: displaying, on the resolution interface, an accept option and a reject option, the accept option comprising an accept control, the reject option comprising a reject control, the resolution interface being displayed when the identified editing conflict is selected; and enabling the user to select the accept control resulting in accepting the identified editing conflict and the reject control resulting in rejecting the identified editing conflict.