The e-commerce powerhouse adds five Apple TV and Chromecast devices to its online store, offering an olive branch to both Google and Apple.

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.

Amazon removed both competing streaming devices from its online store in late 2015. At the time, the company claimed it wanted to "avoid customer confusion" that might be caused by selling streamers that didn't work well with its own Prime Video service, which offers Amazon original shows including "The Man in the High Castle" and "Transparent." But last week Apple TV finally added Prime Video, laying the groundwork for an anticipated return of the device to Amazon.com.

Separately, Google said last week that it was removing YouTube from the Amazon Echo Show and Fire TV devices. Google claimed a "lack of reciprocity" from Amazon, which stopped selling Chromecast and some Google-owned Nest products on its site. Amazon's move to start selling Chromecast again can be seen as an olive branch offered to Google in the hope of bringing YouTube back to Amazon's devices.