Update merge! method within order_decorator to match the syntax of merge...

...! in the order model of spree_core.