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; determining whether the conflict is to be resolved automatically based on an application of conflict resolution logic that comprises applying at least one conflict rule to evaluate a property affecting a presentation of the graphical object; and automatically resolving the conflict based on a determination, by the conflict resolution logic, that the conflict affects the presentation of the graphical object.