fix the nav

Author: reactjs-translation-bot

content/docs/nav.yml

@@ -103,13 +103,8 @@
     - id: javascript-environment-requirements
       title: JavaScript 环境要求
     - id: glossary
-<<<<<<< HEAD
       title: 术语表
 - title: Hooks（新）
-=======
-      title: Glossary
-- title: Hooks (New)
->>>>>>> reactjs.org/master
   isOrdered: true
   items:
       - id: hooks-intro