20120105 entertainment.hindi.bollywood: Hrithik Roshan and Salman Khan resolve differences