improve merging logic for "not" schemas#831

ahl merged 2 commits into

mainoxidecomputer/typify:mainfrom

better-not-mergeoxidecomputer/typify:better-not-mergeCopy head branch name to clipboard