Kim Kardashian had a much discussed talk with her boyfriend and personal assistant Stephanie Shepherd.
But on Saturday Kim showed that she had left that feud when she sent a blitz of happy birthday wishes to Steph on her social media.
And all this love went down when Sister Kourtney Kardashian, who happened to be Steph's best friend, helped organize a party to help feed the homeless in Los Angeles.
Keep up with the Kardashians: Kim K sent a blitz of birthday wishes to the former personal assistant and archenemy Stephanie Shepherd on Saturday
Kim K & # 39; s barrage of birthday wishes on her Instagram story began with a picture of Stephanie on the front seat of a convertible with Kim and Kourtney in the back seat.
& # 39; Happy birthday @steph_shep, I love you & # 39 ;, she wrote in caption. Kim then ended with the friendly jab, & # 39; you're old & # 39 ;.
The Keeping Up With the Kardashian's star shared several other birthday photos on her Instagram and left her with her former PA.
In April, Kim seemed to be reconciled with her former assistant, months after they had gotten out of trouble due to "professional differences & # 39 ;.
BFF beef: Kim and Stephanie had a lot of publicity about professional differences & # 39;
We can work it out: Kim and Stephanie allegedly arranged their feud in April
Together again: Stephanie worked with Kim from 2013-2017
In order not to overlook her, her younger sister, Kourtney was the hand at Stephanie's birthday party.
First, she helped display a row of silver balloons with the words "Congratulations on your wife."
Stephanie has shared video of her bestie that glues the balloons with the caption: "I have the best woman."
Besties: Kourtney helped decorate for the birthday bash Stephanie & # 39; s
BFF love: Kourtney stated: & # 39; Happy Birthday to my wifey & # 39; in balloons during the birthday
Show gratitude: the birthday boy gave a big word of thanks on her big day
Turns out that the birthday bash was all about grateful and giving back to the community. Before her big day, Stephanie decided she wanted to help the less fortunate.
& # 39; Today for the birthday of @steph_shep we make lunches for homeless people in Los Angeles. @ashtag lunchbag, & # 39 ;, Kourtney wrote in a caption of a photograph.
She added: "My hope is that this inspires some of you to get involved in your city. @ hashtaglunchbag & # 39;
Anniversary message: Stephanie wanted a 'help feed with the homeless & # 39; keep a party for her birthday
Return: the goal was to collect 300 lunches for homeless people; the group ended up packing and delivering 500 lunches
With a little help from my friends: friends and family sent much & # 39; thanks & # 39; to Stephanie for the use of her birthday as a way to give something back to the community and the less fortunate
Stephanie asked her friends and family to come together and book 300 lunches for homeless people in Los Angeles.
As you can see in the video she shared, the birthday prospectors all worked in unison like a well-oiled machine and closed the bagging and delivered 500 lunches to downtown Los Angeles.
DJ sisters share SimiHaze: & # 39; Happy birthday @steph_shep and thanks for leading this today, you angel. & # 39;
A grateful Stephanie has given a lot of thanks by sharing: & # 39; I love my friends. & # 39;
Loving life: former Kim K assistant smiled as she worked to feed the homeless
Hands-on: Stephanie and the company eventually delivered 500 lunches
Teamwork! Kourtney, Stephanie and friend Carlos Eric Lopez took a moment to enjoy in their unselfish deed