This reminds me of https://stilleatingoranges.tumblr.com/post/25153960313/the-s.... I wonder if there's a way of presenting new Things as a merging rather than conflict resolution approach and, if so, which would is more effective.