Looks like the wounds have healed from last year's ugly barroom brawl.

Music artists Drake and Chris Brown, who had a violent clash over mutual romantic interest Rihanna at New York nightclub W.I.P. in June 2012, apparently ended their feud this past weekend at the iHeartRadio Music Festival in Las Vegas, at the urging of Def Jam music exec Abou Thiam, one of Brown’s managers, reports the New York Post’s Page Six. Drake even reportedly went to the concert Friday with his entourage specifically to watch Brown, 24, perform.  “Drake came on Friday with his whole crew, and watched Chris’ entire set,” a source told the publication. “They were backstage hugging and drinking.” They reportedly even discussed collaborating on tracks together.

The two singers were sued for $16 million in damages caused by the 2012 incident, with Entertainment Enterprises Ltd., which has a financial stake in club W.I.P., claiming that "each arrived with his own small army of bodyguards, 'security' personnel, employees, friends and other members of their entourage consisting of at least 15 heavily built men trained and/or experienced in hand-to-hand and weapons combat."

TMZ reported the suit claims that the crews of both artists "fashioned deadly weapons out of whatever materials they could find, including glasses, alcohol bottles and furniture." The fight reportedly started when Drake's entourage rebuffed Brown's gesture of a bottle of champagne at the Soho nightclub on June 14. Ice chips were thrown at Brown and then a bottle was reportedly thrown from Brown's table into the crowd. Four bottles were then thrown from Drake's table, one aimed straight for Brown. Brown's girlfriend, Karrueche Tran, suffered a concussion, and Brown tweeted a picture of a cut on his chin following the altercation.