I'm glad they've found a healthier way to work out their long-standing animosity