Nepal, China agree to activate bilateral mechanism to resolve border dispute