Farah Khan makes peace with Shahrukh's ‘Om Shanti Om’