Patent ID: 7933296

Claim:
A method, comprising: receiving a first feed on a first endpoint associated with a first processor from a second endpoint associated with a second processor, wherein the first feed comprises a received item that includes a received item sync data element and a received item data element, the received item data element reflecting a change applied remotely to the received item data element; merging the change to the received item data element communicated by the first feed with a local item in a data store associated with the first endpoint, wherein the merging comprises: determining that the received item is associated with the local item, wherein the local item includes a local item sync element and a local item data element, the local item data element reflecting a change applied locally to the local item data element by the first endpoint; identifying a conflict associated with the change applied remotely to the received item data element and the change applied locally to the local item data element; and comparing at least one element attribute of the received item sync data element with at least one other element attribute of the local item sync element to determine a winning item and a losing item from the received item and the local item; generating a first update to the first feed from the items in the data store, wherein the first update to the first feed includes a conflict collection including conflict data describing the conflict; receiving a second update to the first feed indicating that the conflict is resolved by a user; generating a third update to the first feed by moving the conflict data from the conflict collection to a resolved conflict collection; and communicating the third update to the first feed, including the conflict data in the resolved conflict collection, to the second end point or another remote endpoint.