TikTok and Universal Music Group end feud with new agreement