real-world use was dependant on each's old behavior, so I am reverting that change.  If you need the new, merge-ish behavior, let me know and I will make a new stage for you.