Merge branch 'main' into sync-a3e9466d

Author: orama254

src/sidebarReference.json

@@ -169,27 +169,6 @@
       ]
     },
     {
-<<<<<<< HEAD
-      "title": "Directives",
-      "path": "/reference/react/directives",
-      "canary": true,
-      "routes": [
-        {
-          "title": "'use client'",
-          "path": "/reference/react/use-client",
-          "canary": true
-        },
-        {
-          "title": "'use server'",
-          "path": "/reference/react/use-server",
-          "canary": true
-
-        }
-      ]
-    },
-    {
-=======
->>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
       "hasSectionHeader": true,
       "sectionHeader": "react-dom@{{version}}"
     },