Fix trips_controller.rb errors in merge.