Sonam ends her war with Shahid's dad

7:45 AM Shahid makes the two finally talk out their differences on the director's birthday Shahid Kapoor has managed to broker peace b...