Bipartisan deal reached on short-term ObamaCare fix