The rivalry is dead, they’re besties now