Fixed Spree::Order#merge! method