Simplify and deduplicate Order#merge! implementation
Merge pull request #24 from MountainRoseHerbs/2-3-stable-mrh-fix-order-merge

Simplify and deduplicate Order#merge! implementation