Universal Music Group and TikTok end dispute, agree on deal