Update order_decorator.rb

code was conflict, must be fine now.

Fixes #3640