The feud between Apple TV and Amazon Prime appears to finally be over.

Apple is reportedly planning to unveil an Amazon Prime video app for Apple TV at its Worldwide Developers Conference next month according to a report that claims the new app will go live this summer.

The deal with Amazon is a win-win for Apple. The iPhone-maker will be able to give customers access to more award winning video content like Amazon’s show Transplant and sell more Apple TV units in the process.

Buzzfeed reports that as part of the arrangement between the two companies, Amazon has agreed to begin selling Apple TV again after it removed the product from its store in 2015.

“We want our player, our Prime Video player, to be on [Apple TV], and we want it to be on the device with acceptable business terms,” said Amazon CEO Jeff Bezos in an interview last year. “And so, you can always get the player on the device; the question is can you do so with acceptable business terms. And if you can’t, then we don’t want to sell it to our customers, because they’re going to be buying it thinking they can watch Prime Video and then they’re going to be disappointed. And they’re going to return it.”

Rumors of Apple TV getting Prime Video began to surface last week with a report claiming it would happen in the third quarter of 2017. It’s still unclear when Amazon will start selling Apple TV again.