It looks like relations have warmed between Jeff Bezos and Tim Cook, and Amazon and Apple have reportedly reached a truce in their two-year-long cold war over Apple TV and Amazon Prime content. BuzzFeed reports via inside sources that Amazon Prime will finally be added as an app within the Apple TV universe starting this summer, something that Apple is planning to announce formally at the Worldwide Developers Conference (WWDC) on June 5 in San Jose, CA. Also as part of the deal, Amazon will once again start selling Apple TV set-top boxes, something they ceased doing two years ago to avoid, they said, "customer confusion" with other streaming devices that did feature Amazon Prime video like Roku and the company's own device, Fire TV.

Recode first broke the news last week about the deal taking shape, noting that it was likely struck at the highest level, between Bezos and Cook. Bezos hadn't commented clearly on the tensions between the companies about their competing devices and why Amazon's app had remained a holdout in the Apple TV realm, but he did hint at Recode's Code Conference last year that it had something to do with "acceptable business terms" being available for putting their app on the device.

And Recode notes that the deal shows how Amazon now recognizes the importance of video distribution in sales of its Prime memberships. As Bezos put it, "When we win a Golden Globe, it helps us sell more shoes."

BuzzFeed didn't get official comment from either company on the deal, and they don't have a hard date for when Apple TVs will again be for sale by Amazon or its third-party sellers.

Previously: Apple Bankrolls Their First Scripted TV Series, Starring Dr. Dre