Update shipping_controller.rb

removed merge conflict leftovers