Nepal and China on Thursday resolved a long- standing row over the height of the world