Amazon said Thursday that it will again be selling Apple TV and Google Chromecast devices, two video-streaming gadgets the e-commerce giant removed from its site two years ago and that compete with its own Fire TV products.

"I can confirm that we are assorting Apple TV and Chromecast," an Amazon spokeswoman told CNET on Thursday, referring to the company's plans to stock up on the devices. She offered no further statements.

Amazon added product listing pages for the Apple TV and two versions of the Apple TV 4K, as well as the Google Chromecast and Chromecast Ultra. The gadgets aren't available for sale yet, but customers should expect they will be shortly.

Amazon's move should be a relief for customers of all three tech titans, who may have felt caught in the middle of public disputes between the companies.

The change may de-escalate mounting fights between Amazon and Google in particular, whose disagreements resulted in Google pulling YouTube from Amazon devices just last week. Amazon is pushing deeper into Google's turf of online advertising and Google is moving into Amazon's territory of e-commerce and smart speakers, which seems to be causing tensions between the two companies.

"We are in productive discussions with Amazon to reach an agreement for the benefit of our mutual customers," a Google spokesperson said Thursday. "We hope we can reach an agreement to resolve these issues soon."

Apple representatives didn't respond to a request for comment.