BY ALEX WEPRIN | HollywoodReporter.Com

The companies had been in a bitter public dispute since April, and with a deal for the main YouTube app set to expire Thursday.

After a bitter, public, months-long dispute, Roku and Google have come to terms on a new multi-year distribution agreement, which covers both YouTube and YouTube TV.

The new deal will return the YouTube TV app to Roku’s store, and will keep the main YouTube app from being pulled from the platform (the companies had warned that the app would be pulled from Roku’s store on Dec. 9 if they couldn’t come to terms).

“Roku and Google have agreed to a multi-year extension for both YouTube and YouTube TV,” a Roku spokesperson tells The Hollywood Reporter in a statement. “This agreement represents a positive development for our shared customers, making both YouTube and YouTube TV available for all streamers on the Roku platform.”

“We’re happy to share that we’ve reached a deal with Roku to continue distributing the YouTube and YouTube TV apps on Roku devices,” A youTube spokesperson said. “This means that Roku customers will continue to have access to YouTube and that the YouTube TV app will once again be available in the Roku store for both new and existing members. We are pleased to have a partnership that benefits our mutual users.”

YouTube TV, which is the streaming service’s pay-TV offering, had been pulled from Roku in April after a distribution dispute between the companies escalated and spilled into the public view.

Roku alleged the tech giant wanted to manipulate search results and force the company to use chips that could raise the cost of its hardware. YouTube responded by calling those claims “baseless and false” and that “Roku requested exceptions that would break the YouTube experience and limit our ability to update YouTube in order to fix issues or add new features.”

The dispute between Roku and Google underscores the complex relationship between streaming content providers and streaming distribution platforms. While in the legacy cable business carriage fee disputes would sometimes keep channels off of cable platforms, in streaming those disputes can be more complex, involving shared advertising, data, or other factors.

And when the players are involves are the largest streaming distribution platform (Roku) and the largest free streaming video company (YouTube), the stakes are particularly high.