The Senate is making it hard for the public to follow it so there's no telling what the end result will be.
I got to “S.AMDT.1150 to S.1348 In the nature of a substitute” on thomas, but after that the text did not seem organized.
Note that virtually everything that happened in the Senate was an amendment to 1150, not to 1348. Even the cloture votes were about 1150, the White House amendments, and not about 1348.