Found *a* solution to the idiocy surrounding merging.  I'm really
unhappy with this solution, but at least I have a beachhead.