For what it's worth, you can use Microsoft Word to diff two versions (including formatting). Paste the two versions into two different documents, save them and use the Tools>Merge Documents function. @John: 1. Do you wish there was a better way to resolve conflicts in an Evernote note? (yes/no) yes 2. Do you wish there was a better way to share changes you make to your Evernote notes with those you are sharing them with? (yes/no) not really. 3. What do you think such a solution is worth paying for - if offered as a subscription based service: 15 - 20 p/month10 - 15 p/month5 - 10 p/monthNothingJohn, not to sound snarky, but I hope the "p" stands for "pence"... The complete Evernote premium costs 5USD/month, less if you subscribe for the whole year. For a good and easy way to resolve conflicts, I would pay an additional 50c/month. 4. What Evernote intergrations are you using already - mark all that apply: QuickOffice 5. Why do you use the product indicated in question (4) above: Edit MS Office documents on iOS.