I really, really hope this means they can implement 3-way merge on sync for text-only notes. Any time one of my clients silently decides to stop syncing, I'm th

I really, really hope this means they can implement 3-way merge on sync for text-only notes. Any time one of my clients silently decides to stop syncing, I'm then stuck doing a hand baseless merge on every device. It wouldn't be an issue if it was infrequent, but this is a weekly problem with multiple OSX and iOS clients (maybe not on Windows?).