Disney and DirecTV’s spat began on September 1st, when negotiations between the two for a new carriage deal broke down, and Disney pulled all of its programming. Disney had a similar, 12-day dispute with Charter this time last year, blocking its channels for Spectrum subscribers in the middle of the US Open.

DirecTV customers received a surprise Saturday just in time for Week 3 of college football. After a roughly two-week blackout and growing frustration from customers, DirecTV and Disney reached a deal Saturday morning that brought ESPN and other Disney-owned channels back to the pay-tv provider’s customers.

Disney and DirecTV on Saturday ended a tense contract dispute that will restore television channels including ESPN, ABC and FX to over 11 million subscribers of the satellite TV service that had lost access to those stations during a nearly two-week blackout period.