They were bitter enemies not long ago, to the point that YouTube TV lost a large chunk of its customer base during the feud.