Near as I can tell you are correct, Elizabeth.  The bill is apparently in conference committee  to resolve a difference between the bill as passed by each house of Congress.  It seems like there is an amendment at issue in the Senate bill by Senator Patrick Leahy, though I'm not sure which one as he added several.  (My source is the same as yours.)

His Holiness, The Glorified Houseplant Who Would Be Caesar has threatened to veto the bill, and it's unclear whether the bill has enough support in the HoR to override that, though I'm pessimistic at this point given your numbers.

I'm currently still trying to track down more info., and whether there's some sort of major organized pressure being brought to bear on the dissenting House members.

Kisses,

JanieBelle

Dream a little dream of me.