Is the Salman Khan - Shahrukh Khan war really over?