Amazon (AMZN) and Apple (AAPL) appear to have finally buried their bitter rivalry. Buzzfeed reports that the two tech giants have agreed to introduce Amazon Prime Video to Apple TV after years of shunning each other’s competing video products.

According to Buzzfeed, Apple plans to announce the arrival of Amazon’s Prime Video to its set-top box at the company’s annual Worldwide Developers Conference, which will take place June 5 in San Jose, California. It is believed that the app will go live this summer, although a firm release date has yet to be provided.      

Amazon had previously declined to offer Prime on Apple’s TV app store, despite the California-based company proclaiming that “all are welcome” to join. As a result, subscribers were only able to watch Amazon’s growing library of shows through Apple’s Airplay system, a less reliable process that involves connecting products, such as an iPhone, to an Apple TV via WiFi.

Amazon Ends Boycott

The terms of the agreement mean that Amazon will once again sell Apple’s set-top box on its website, marking the end of a two-year boycott that also saw the Seattle-based company ban Google’s (GOOG) Chromecast devices from its online shelves.

Recode, which was the first to report on rumors of Amazon and Apple’s truce last week, previously claimed that Amazon booted the two competing products from its site because Google and Apple’s demands were unreasonable. Incidentally, this bold move to snub its tech peers coincided with the launch of Amazon’s rival Fire TV stick device. (See also: Who are Amazon's (AMZN) main competitors?)

Apple Puts Rivalries to Rest

Apple’s eagerness to bury the hatchet with rivals also saw it extend an olive branch to Microsoft (MSFT). The Washington-based company confirmed that Apple’s popular iTunes music app will now be available through its Windows Store by the end of the year. The new version will be able to do everything that the regular iTunes does.

This is a significant move on Microsoft's part as well, considering the new Windows 10S only allows Microsoft-approved apps to be downloaded from the store. Microsoft also agreed to let users download three different versions of Linux, the operating system that it once considered a threat. (See also: Microsoft Shutting Google Chrome Out Of Latest Windows Version)