Android TV is slowly making a comeback, and Amazon wants in, despite recent overt competition between the two tech giants. To dip its toes in the water, Amazon is starting by creating an Amazon Music app for Android TV.

One Amazon app that seems to consistently rise above the conflict is Amazon Music. Amazon’s music streaming service, which can be enhanced with Prime membership, is available in the Play Store and has had Chromecast support for over a year. Today, Android Police has found, Amazon Music is getting its own Android TV app in the Play Store.

In contrast to this good will, Amazon Prime Video has still not been given Chromecast support or an Android TV app that works consistently, despite high user demand. This means that for many users (like myself) the library of Prime Video content is simply unavailable to watch on the big screen. The only obvious reason for this is an attempt to sell Fire Stick and Fire TV hardware.