YouTube and Roku Inc have announced a multi-year pact.
The deal puts an end to the battle between the two companies that dragged for months over accusations of anti-competitive conduct.
YouTube owner Alphabet Inc’s Google (GOOGL.O) and streaming platform Roku had publicly feuded since April over technical and financial terms for distributing YouTube’s flagship app and its YouTube TV service.
Roku had opposed what it described as unfair terms such as favoring YouTube in search results and updating its hardware.
YouTube had described its efforts as consumer-friendly, and said Roku was the one using its market power to force a better deal.
Roku removed the YouTube TV app from its channel store after the agreement for that app expired.
YouTube, which has more than 2 billion monthly users, threatened to pull its main app from Roku on Thursday, when the deal for the service was to end.