Kim Kardashian's feud with Jon Hamm has ended. They both put in appearances on "30 Rock" Live last night, and in the process, put their war of words to bed.

According to TMZ, the pair talked after the show was over.

"We laughed it all off," Kim reportedly told a friend. She also said he was "very sweet and very respectful."

That's a far cry from the position he took towards her when speaking to UK Elle last month.

“Whether it’s Paris Hilton or Kim Kardashian or whoever, stupidity is certainly celebrated," he told the publication. "Being a f**king idiot is a valuable commodity in this culture because you’re rewarded significantly.”

Kim shot back: Calling someone who runs their own businesses, is a part of a successful TV show, produces, writes, designs, and creates, "stupid," is in my opinion careless."