NBCUniversal and Dish Network have put down their legal swords over the ad-skipping tech the satellite company introduced several years back and reached a carriage deal. The ad-skipping deal joins Fox’s lawsuit ending agreement in February and the settlement CBS and Dish came to in December 2014.

“NBCUniversal and DISH Network have reached an agreement resulting in the dismissal of all pending litigation between the two companies, including disputes over the AutoHop and PrimeTime Anytime features,” said a spokesperson for the Comcast owned company. The agreement will allow Dish subscribers to ad-skip a week after a show has initially aired. With NBCU providing no details, the deal also settles the retransmission contract clash between the two parties that Dish threatened to take to arbitration earlier this year.

NBC, Fox, CBS and ABC all took their umbrage to court back in 2012 to stop the ad-skipping tech. Essentially, they alleged that the AutoHop technology infringed on its copyrights and breached the terms of their carriage deal with Dish. The No. 2 satellite company responded that the tech was a consumer-friendly change that merely automated the ad skipping that consumers already do with their remote controls – and the nets should embrace the future.

With motions and filings filling the courts, the matters simmered and were seemingly resolved as those carriage deals came up for renewal.

NBCU and Dish’s current carriage deal battle involves NBC and Telemundo stations the programmer owns in markets including New York, Los Angeles, Chicago, Dallas, and Miami as well as pay TV services including USA, Syfy, Bravo, CNBC, and MSNBC.

Dish’s satellite service has about 13.4 million subscribers.