Remove conflict from order.rb