CBS and Dish Network reached an agreement over a new distribution deal, both companies announced on Saturday, bringing an end to a long running saga that culminated in a brief programming blackout on Friday.

For months, the companies have sparred over the monthly price per subscriber the satellite operator, which has 14 million subscribers, would pay to carry CBS.