I am traveling internationally and using Evernote to keep my notes on destinations as well as draft blog posts. Given that I frequently have a flaky network connection, I get conflicts incredibly frequently, often with fairly long notes that are impossible to visually inspect. Sometimes I either can't find the conflict or it appears to be something on the order of extra whitespace. The current workflow to resolve these "conflicts" is atrocious, and a huge time-waster for me, which is ironic given I'm attempting to use Evernote as a productivity tool. I'm in the process of finding a replacement because this one issue is so time consuming. IMO, if Evernote detects a conflict, it should highlight where it thinks the conflicting section is. I don't need a full blown VCS merge tool, I just want to see where it thinks I'm having an issue with higher fidelity than an entire note.