Diddy & Cassie: A Little BDay Cake Makes It All Better

If there was any doubt Diddy and Cassie were actually back on good terms -- let it be put to rest -- because the two spent her bday together.

In a video from Cassie's 30th Friday night, you can see an overly-excited Diddy shouting happy birthday to his gf. The rapper also posted a birthday montage for Cassie, saying, "I love you always."

So safe to say, fight officially officially over.