Shahrukh Khan and Farah Khan kiss and make up!