+1 Evernote seems particularly vulnerable to thinking I have conflicting changes - I use it on a BlackBerry, and two desktop PCs (one with Windows, one with Mac), and if I happen to be reviewing a file that hasn't yet been sync'd, Evernote plays really conservative (thankfully) and creates a potential "conflicted" memo. If only it had an integrated way to "diff" between memos.