DJ Mustard's performance at Coachella 2016 featured a pleasant surprise. During his set at the Sahara Tent, the DJ and beat maker brought out frequent collaborator YG.

The Bompton rapper popped up on the stage and launched into his hits "My Nigga" and "Who Do You Love," and finished out with the new Nipsey Hussle collab "FDT," while the crowd went crazy.

If it seems like it has been a while since the two, one-time seemingly inseparable artists, have been together, it has. In late 2014, the Pu$haz Ink co-founders got into a overnight beef that turned public when Mustard expresssed his displeasure over not getting paid for his work on YG's My Krazy Life.

They later squashed their beef with a fist fight according to the two artists. “Anytime anyone of my friends in my camp, if we argue, we gonna fight for real,” said Mustard. “We gonna fight and get it over with…[Me and YG] fought and now we’re good. That’s how it’s supposed to be.”

Even though the issue has been settled, YG and Mustard have still not been together like they used to be before the dust-up. At least in the public eye.

Now it appears the two are totally back on good terms. That would be a good thing. Especially with the Cali MC working on finishing his sophomore project Still Krazy. We could definitely use more fire collabs from the dynamic duo.

See 40 Hip-Hop Albums Turning 20 in 2016

More From XXL