1. A method comprising: receiving, by an electronic device, a first instance of a modular document composed of plural parts, wherein the modular document contains a merge definition; receiving, by the electronic device, a second instance of the modular document, wherein the first instance and the second instance of the modular document have been modified with respect to each other, wherein the second instance also contains a merge definition; and determining whether any conflict exists between the merge definition of the second instance and the merge definition of the first instance, wherein each of the merge definitions provides information regarding how conflicts in the first and second instances are to be resolved.
10. The method of claim 1 , wherein receiving the first instance of the modular document composed of the plural parts comprises receiving the first instance of the modular document composed of plural component documents that are combined to allow presentation of the modular document.