Javascript states on booking flow
merge master