Hrithik, Kangana want resolve on the spat