1. A computer-implemented method for resolving text change conflicts, comprising: receiving at a client an update notification from a server; wherein the update notification includes an update to a current version of text that is co-edited by clients; determining at the client, when the client has a non-selected text change to update the current version of the text; initiating a conflict resolution procedure on the client to create an updated text change to reflect the updated current version of the text and the non-selected text change; and submitting the updated text change to the server to update the current version of the text.