Columbia Records, which signed the Auckland teen, announced yesterday that Jawsh 685 and Jason Derulo have "put aside their differences and come together".
Credits for Savage Love (Laxed – Siren Beat) list Jawsh 685 as the artist (along with Derulo), sole producer and co-writer on the track, along with Jacob "J Kash" Kasher, Phil Gress and Derulo.
The drama began when Derulo used the teen's track without permission.
The 17-year-old student and music producer Joshua Stylah, AKA Jawsh 685, went viral on TikTok with his track Laxed (Siren Beat), racking up tens of millions of views.
Not long after that, the pop singer was instantly blasted for not properly crediting Stylah for his track after he teased Savage Love on TikTok.
READ MORE:
• Teen sensation Joshua Nanai goes viral on TikTok with Laxed (Siren Beat)
• Laxed (Siren Beat) creator Joshua Stylah on Jason Derulo stoush and new music
• 'Feeling thankful': Teen TikTok star Joshua Nanai has major label deal, R&B star didn't 'steal' song
• Source claims Jason Derulo 'went rogue' when taking Kiwi teen's song
In an exclusive interview with the Herald at the end of May, the South Auckland TikTok sensation revealed he was still "upset" with R&B star Jason Derulo after the US hitmaker took his song without permission, and revealed details of his upcoming releases.
He went viral on TikTok with his track Laxed (Siren Beat), racking up tens of millions of views, before he was caught up in controversy when Jason Derulo used the popular song without permission.
The Manurewa High School student told the Herald: "I'm still a little upset he used my beat without permission. An apology would be good."
The two have now ended their feud and the collaboration dropped on streaming platforms at 12am on Thursday, with all credits where credits were due.