Yes but even more so than what you supposed. The Senate has to pass a bill that ROUGHLY matches the one from the House. Conferees from both bodies then meet to create a single bill which is then voted up or down in each body. So there are 4 more votes (including the committee vote) before it COULD get to Obama's desk.and in order to meet Obama's most recent goal, this has to be done in about 6 weeks before the end of the year deadline. Be sure to let your Senators know how you feel about this operation.
“is there a floor vote on the combined bill?”
Yes.
But it will be a one-shot up-or-down vote. And given how the leadership keeps playing fast and loose with legislative process, inserting things at the last minute, etc. one can expect a very different bill to come back.
It’s all a total sham. The leaders will stuff whatever they can get away with into the sausage.