Evernote still can't handle even simple non-overlapping changes on two devices. Every time I close my laptop I have to wonder if changes were synched. Especially embarrassing because superb open source code is already available for conflict resolution (git, for example).
EDIT: someone should write a notekeeping app built on github.