Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle