Just as we were beginning to believe beef was in season (it looks like Mobb Deep‘s Havoc and Prodigy are now going at it), Tyler, The Creator and Rah Digga ended their feud during Saturday’s Paid Dues festival.

Tyler posted the above photo of Rah Digga and himself via Instagram and tweeted:

Digga also chimed in with some positive words and confirmed the pair are now on good terms:

The feud began after she caught ear of Tyler, The Creator’s “Let’s get it poppin’ like MC Lyte around some dykes” line on Odd Future‘s “Rella” song, coupled with a tweet he sent to Digga herself back in June 2011 wishing her a Happy Father’s Day.

The former Flipmode Squad member then fired back at Tyler, The Creator in her recent song “The N***a In Me“, in which she rapped: “I was trying to support this young black man/It’s too bad, you probably lost your only black fan”. She also returned D.C. rapper Fat Trel‘s remarks in the diss record, spitting: “Fat Trel can kiss my global rap ass/He barely out of D.C./Tried to look ‘em up, he ain’t even got a Wiki.”