Contents of a copy of a server file may be saved to a down load file, a base file, and a working file. An indication may be received from an application that the application has edited the working file and a copy of the edited working file may be saved to an upload file. A server computer may be queried to determine if the server file on the server computer has been changed. If the server file on the server computer has not been changed, the server file on the server computer may be updated with contents of the upload file. If the server file on the server computer has been changed, a three-way merge of the upload file, the base file, and the changed server file on the server computer may be performed. Then the server file on the server computer may be updated with the three-way merge results.