Did Kim Kardashian and Jon Hamm put a cease fire to their recent war of words with the help of Tina Fey?
The "Mad Men" star and the reality star both appeared on "30 Rock's" live episode on Thursday night, where they reportedly made up.
In March, Jon slammed Kim and Paris Hilton saying, "Being a [expletive] idiot is a valuable commodity in this culture."
Kim later responded to his comments, saying they were "careless."
According to TMZ, after the show Kim and Jon "laughed it all off," a friend of the reality star told TMZ.
Adding that Kim said Jon was "very sweet and very respectful."
After her appearance Kim Tweeted, "Anyone see 30 Rock tonight??? I had a blast!!!! Love this show!"
AH Nation Poll: "Which '30 Rock' live cameo was your favorite?" VOTE HERE!
Copyright 2012 by NBC Universal, Inc. All rights reserved. This material may not be published, broadcast, rewritten or redistributed.