Katy Perry says it was time to end her feud with Calvin Harris, six years after they fell out over a concert tour.
