I'm definitely in agreement that this would be a most useful feature. I too run across conflicts at least once a month, having EN on three different devices. EN does a pretty good job of syncing them, but when there are conflicts, they're typically in large notes that are hard to merge without some outside help.