The two rivals seem to be on good terms