Kim Kardashian and Jon Hamm Call a Truce, Make Nice at 30 Rock Live Episode!

At last! Our long national nightmare is over! Is there nothing Tina Fey can't accomplish once she puts her mind to it?

Sure, she pulled off not one but two live episodes of 30 Rock last night, but the real feat of her evening has to be—inadvertent though it may have been—defusing the once-simmeringfeud between Kim Kardashian and Jon Hamm, both of whom appeared in cameo roles on last night's must-see extravaganza and who, E! News has learned, subsequently put to bed any lingering tensions.

A source told E! News that the duo crossed paths backstage, at which point the Mad Men star, who wasn't exactly effusive with his praise of the reality titan earlier this year, was "beyond charming" with Kim.

The meet was described as "quick" but friendly, and the duo exchanged easy pleasantries, with the source adding that "there's no animosity" between the pop culture icons.