India-China relations, from conflict to cautious thaw