Spoiler From Zap2it - 15th October 2012

Yes, you did see Stefan punching Damon in the trailer for this week's episode. We have to say, Damon kind of deserves it -- he gets Stefan's fist to his face after telling Stefan something he knows will hurt his feelings. That said, the punch is the end of the fight, not the beginning of it. By the end of the episode, Stefan makes sure Damon is included in an extremely touching gesture. Awww.