After some debate, Disney and Amazon have struck a deal to allow Disney+ to stream on Amazon’s Fire TV devices when the new streaming service launches on Nov. 12. Disney CEO Bob Iger announced the news during Disney’s earnings call yesterday. In another last-minute decision, Disney+ will be added to Samsung and LG devices as well. The two tech giants were previously in a standoff over whether Disney would relent on Amazon’s request to sell up to 30% of its ad space on Disney’s apps in exchange for carrying them on Fire TV devices, according to the Wall Street Journal. It’s unclear as of yet how those negotiations were resolved, but it looks like the two have decided to play ball together.