Amazon and Google are ending their nearly 2-year spat, agreeing to bring their video streaming apps to each other’s devices.

Back in 2017, Google pulled its popular YouTube video app from Amazon’s Fire TV after the online shopping giant refused to sell some Google products. Amazon has since started to sell Google’s gadgets on its site.

“We are excited to work with Amazon to launch the official YouTube apps on Fire TV devices worldwide,” said Heather Rivera, Global Head of Product Partnerships at YouTube. “Bringing our flagship YouTube experience to Amazon Fire TV gives our users even more ways to watch the videos and creators they love.”

Amazon said Thursday that YouTube will appear on Amazon’s Fire TV devices and smart TVs in the coming months, but did not give an exact date. In addition, Amazon’s Prime Video streaming app will be added to Google’s streaming devices and TV’s that use Google’s operating system. Other YouTube apps, such as YouTube Kids and YouTube TV, will be added to Fire TV devices later this year.

“We’re excited to bring the Prime Video app to Chromecast and Android TV devices, and to give our customers convenient access to the shows and movies they love,” said Andrew Bennett, Head of Worldwide Business Development for Prime Video. “Whether watching the latest season of The Marvelous Mrs. Maisel, catching teams go head-to-head on Thursday Night Football or renting a new-release movie, customers will have even more ways to stream what they want, whenever they want, no matter where they are.”