One of the messiest celebrity feuds on social media has now been put to rest.

Rapper Fetty Wap has reportedly made amends with Love & Hip Hop star Masika Kalysha, his soon-to-be baby’s mama. The two apparently got freaky after some late night studio sessions, conceived a child, and have been at each other’s necks ever since. The beef was primarily due to Fetty’s denial of paternity. He claimed Masika was a jump-off, who was simply using him as a come up (haven’t we heard that before).

Well, something happened during the course of all that pettiness that caused Fetty to have a change of heart. The “Trap Queen” rapper took the mommy-to-be on a ballerific shopping spree to Petit Tresor in Los Angeles, dropping $20,000 on everything from baby clothes to furniture. We think this might have something to do with Masika pulling out the receipts on Fetty and providing compelling evidence that he is actually the father.

Let’s hope the baby can be welcomed into the world with both parents on good terms. Check out a photo from her baby shower above & head over to TheYBF for more on their roller coaster love affair.