fixed seat reservation functionality
update
fixed merge conflict