India, China resolutions to end border conflict