Changes to seats_controller.rb
Fix merge conflict