1. A method, comprising: detecting a conflict relating to a graphical object in a first version of a digital document and the graphical object in a second version of the digital document; categorizing the conflict as a conflict to be resolved automatically based on an application of conflict resolution logic, wherein the conflict resolution logic comprises: applying at least one conflict rule evaluating a property affecting a presentation of the graphical object, and determining that the conflict modifies the presentation of the graphical object; and automatically resolving the conflict by updating, in a user interface of a productivity service, one or more of the first version of the digital document and the second version of the digital document based on the categorizing.
1. A method, comprising: detecting a conflict relating to a graphical object in a first version of a digital document and the graphical object in a second version of the digital document; categorizing the conflict as a conflict to be resolved automatically based on an application of conflict resolution logic, wherein the conflict resolution logic comprises: applying at least one conflict rule evaluating a property affecting a presentation of the graphical object, and determining that the conflict modifies the presentation of the graphical object; and automatically resolving the conflict by updating, in a user interface of a productivity service, one or more of the first version of the digital document and the second version of the digital document based on the categorizing. 6. The method of claim 1 , wherein the conflict resolution logic selects the at least one conflict rule based on a classification of the conflict as a page-level conflict.