Brooklyn, NY – Funkmaster Flex and Lil Pump have ended their year-long feud. The longtime Hot 97 DJ and platinum-selling rapper put their issues to the side after linking up at Post Malone’s concert in Brooklyn on Saturday (December 29).

Flex shared a picture of the two together via Instagram and revealed he had a productive conversation with Pump at the event.

“We spoke,” he wrote. “I respect he waited around till after my set with good words.. I was honest with him on how a felt about his music… he carried himself well and took it like a gentleman! love! @lilpump (I told u I would post the pic) I could tell he didn’t believe I would!!! @aliviacaba I’m good with one of your favorites now!!!”

Flex and Pump had been at odds since last year when the outspoken DJ criticized the “Gucci Gang” creator for passing out weed at a concert. Since then, the two would often trade shots on social media.

In one of the more notable moments in their feud, Flex posted a video of Pump blowing his nose with a $100 bill and said he should use the money for a ghostwriter. Pump responded by getting his fans to comment “L” on Flex’s page.

Check out some of Flex’s tirades against Pump below.

View this post on Instagram

Funk Flex calls Lil Pump trash

A post shared by VladTV (@vladtv) on