Patent Document ID: 8886725
Application ID: 12511513

Base Claim:
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.

---

Claim 12:
12. The method of claim 1 , wherein the merge definition of the first instance is embedded in the modular document that is according to an Extensible Markup Language (XML) format.