Maybe they will stop for now, but they'll ultimately come back.
Even though they are next door neighbors, they have much less contact than India does with its other neighbors and the same for China, blame the huge mountain range between them and cultural differences.
But we're gonna keep seeing India and China or India vs. China because of them both becoming large world powers, both make up 1/3 of humanity, both will keep competing for natural resources to keep their economies going.
By the way, I have a negative opinion of Germany.