India and China Agree to End Tense Border Conflict