Fortunately the ladies have kissed and made up since yesterday's Twitter war, but meoooow!

It all started when Ciara went on E!'s Fashion Police and said that Rihanna "wasn't the nicest" when she bumped into her at a party. Ciara added, "It's crazy, because I've always loved and respected what she's done in fashion. It wasn't the most pleasant run-in."

A little bit later Rihanna tweeted, "My bad Ci, did I forget to tip you? How rude of me....You gangsta huh? Ha." Ciara replied, "Trust me Rihanna you don't want to see me on or off the stage." Rihanna fired back and wrote, "Good luck with bookin that stage you speak of." Burn!

Despite her super catty comment, Rihanna was actually the one who called a truce, tweeting, "Ciara baby, I love you girl! You hurt my feelings real bad on TV! I'm heartbroken! That's why I retaliated this way! So sorry! Let's make up." Ciara wrote back, "Rhi, u know its always been love since day 1! Doing shows and everything. You threw me off in that party! Apology accepted. Let's chat in person." Whew!