[tarruda]

I think the simplest strategy is to create "conflict documents" containing all conflicted data and present to the user for manual resolution.

This seems similar to what Evernote does