You can then accept or reject all changes or each change individually. You can resolve the conflict by saving your document. ...