YG and DJ Mustard are back at it again. The rapper and producer have had their ups and downs, but they showed that it’s all good between them during a reconciliation at Coachella on Friday (Apr. 15).

“For a whole year me and this ni**a @djmustard ain’t been BOOL ‘at all,'” YG wrote on Instagram. “But ni**az FINALLY sat it down and holla’D like some successful azz day 1’s pose 2 ✊🏾 & uhhhhhhh now…. WE BACK BITCHES!!!!”

https://www.instagram.com/p/BERVah2oBxA/

Mustard also alluded to future collabs in his post about the reunion. “We back and got more money lmao you ni**as in trouble ! 400SUMMERS,” he wrote in a similar IG update.

This isn’t the first time the two have beefed and reconciled. In 2014, they had an Instagram feud before squashing the beef less than a month later.

https://www.instagram.com/p/BERZH0-IB6u/

Beyond the Mustard news, YG also took time to get political at Coachella, delivering his “F**k Donald Trump” message to festivalgoers with middle fingers in the air before performing his anti-Trump anthem “FDT.”

YG’s Coachella showing comes just before he embarks on “The Endless Summer Tour,” which will be co-headlined by G-Eazy and Logic. He is also readying his long-awaited sophomore album Still Krazy, which will likely feature production from DJ Mustard.