Changes to the seat selection message
Fixed merge issues