Fix merge issues

Author: benbrandt

docs/protocol/draft/schema.mdx

@@ -2519,7 +2519,12 @@ Authentication-related capabilities supported by the agent.
 
 </ResponseField>
 <ResponseField name="nes" type={<><span><a href="#nescapabilities">NesCapabilities</a></span><span> | null</span></>} >
-  NES (Next Edit Suggestions) capabilities supported by the agent.
+  **UNSTABLE**
+
+This capability is not part of the spec yet, and may be removed or changed at any point.
+
+NES (Next Edit Suggestions) capabilities supported by the agent.
+
 </ResponseField>
 <ResponseField name="positionEncoding" type={<><span><a href="#positionencodingkind">PositionEncodingKind</a></span><span> | null</span></>} >
   **UNSTABLE**

schema/schema.unstable.json

@@ -91,7 +91,7 @@
               "type": "null"
             }
           ],
-          "description": "NES (Next Edit Suggestions) capabilities supported by the agent."
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNES (Next Edit Suggestions) capabilities supported by the agent."
         },
         "positionEncoding": {
           "anyOf": [

src/agent.rs

@@ -3828,6 +3828,10 @@ pub struct AgentCapabilities {
     #[cfg(feature = "unstable_llm_providers")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub providers: Option<ProvidersCapabilities>,
+    /// **UNSTABLE**
+    ///
+    /// This capability is not part of the spec yet, and may be removed or changed at any point.
+    ///
     /// NES (Next Edit Suggestions) capabilities supported by the agent.
     #[cfg(feature = "unstable_nes")]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -3907,6 +3911,10 @@ impl AgentCapabilities {
         self
     }
 
+    /// **UNSTABLE**
+    ///
+    /// This capability is not part of the spec yet, and may be removed or changed at any point.
+    ///
     /// NES (Next Edit Suggestions) capabilities supported by the agent.
     #[cfg(feature = "unstable_nes")]
     #[must_use]