India says border standoff with China to end