Paul McCartney resolves dispute on Beatles song rights