china working with india to resolve border issues