In an apparent peace offering this week, Amazon said it will begin selling Chromecast again.
But behind the scenes, moves by Jeff Bezos' company have some fearing the battle could be about to get uglier.
As Google was trying to block YouTube from playing on Amazon devices, earlier this month the e-commerce giant quietly filed two trademark requests with the US Patent and Trademark Office for something called AMAZONTUBE, and another called OPENTUBE.
Documents show the patents relate to "software for integration of video, audiovisual, and multimedia content and functionality into websites, software applications, portable electronic devices, handheld devices, electronic reading devices, portable media players, mobile phones, smartphones, portable digital devices, computers, and other communications networks."
Basically, Amazon is describing a streaming video service with the potential to host lots of media.
As Domain Name Wire reported, it comes at the same time the company registered three domains names: AlexaOpenTube.com, AmazonAlexaTube.com and AmazonOpenTube.com.
It may be part of the ongoing gamesmanship between the two companies but clearly Amazon is up to something.
YouTube remains by far and away the dominant platform for uploading and sharing video content, but there could soon be a new kid on the block.