Storyboard has been successfully merged by … not merging the storyboard. I just copy/pasted to replace a couple view controllers from one version in the other. Wasn’t so bad, but I still wish there was a way to actually merge.