Oft-maligned Elle editorial mainstay Erin Kaplan got the last laugh, and rightfully so, on last night's The City. Meanwhile, Whitney Port blurred the lines of business and pleasure.

In "Queen of Diamonds," Olivia Palermo totally thought she was. Elle boss Joe Zee somehow considered her ability to pick out jewels for Fergie's cover shoot some amazing skill.

It wasn't. Erin made the correct call when she said the cover image should not include any of the diamonds Olivia selected for the pop singer to wear. Joe finally agreed with her.

Amazing that it's taken this long for Erin to win one of her weekly clashes with Olivia, and be praised for it no less. Olivia finally taking some lumps? What is this, like a real job?

Erin Kaplan had reason to smile at the end of last night's episode.

Meanwhile, stylista Whitney Port was readying for her look book presentation and enlisted the help of hot French photographer Jonathan in order to get the pictures just right.

The problem? Jonathan wants her.

Thus, by accepting his free offers of help, Whitney put them both in an awkward position when he wanted to pursue things further, and she had to let him down. It was rough.

The "I'm too busy for a social life right now" bit is such garbage. If that were true, no one would have a social life ... you make it work if you want to. Lame breakup line #92.

Naturally, Roxy thought everything Whitney did was fine, while Kelly Cutrone called her out on it. You can't go wrong if you follow Kell - you'll always hear about just how it is.

The good news? The shoot went well, so Whit's fashion line seems to be on the up and up. Hey, whatever toes you've got to step on or photographers you have to sleep with.

Steve Marsi is the Managing Editor of TV Fanatic. Follow him on Google+ or email him here.