docs: repair features.yaml rebase splice

Author: rynfar

.pylon/features.yaml

@@ -282,15 +282,12 @@ decisions:
       - Prime routes subagent and derived-request provider hooks through the owning session's extension runner.
       - An upstream extension contract exposes per-agent provider identity that supersedes the scoped session-id view.
   kind-aware-provider-retry:
-
-turn-scoped-subagent-cancellation:
     area: runtime-reliability
-    state: candidate
+    state: shipped
     owner: pylon-prime-integration
     decision: redesign
     pylon_refs:
       - https://github.com/pylon-code/prime-agent/issues/22
-<<<<<<< HEAD
       - https://github.com/pylon-code/prime-agent/issues/24
     upstream_refs:
       - https://github.com/PrimeIntellect-ai/prime-agent/tree/a903d4b6768f484bd6d459b7b0aa7dee38e461e2
@@ -299,7 +296,14 @@ turn-scoped-subagent-cancellation:
     revisit_when:
       - Prime upstream makes the session retry loop failure-kind aware and honors Retry-After with a delay ceiling.
       - Prime upstream makes exactly one retry layer own policy so provider SDK retries cannot multiply session retries.
-=======
+
+  turn-scoped-subagent-cancellation:
+    area: runtime-reliability
+    state: candidate
+    owner: pylon-prime-integration
+    decision: redesign
+    pylon_refs:
+      - https://github.com/pylon-code/prime-agent/issues/22
       - https://github.com/pylon-code/prime-agent/issues/25
       - https://github.com/pylon-code/prime-agent/pull/35
     upstream_refs:
@@ -312,4 +316,3 @@ turn-scoped-subagent-cancellation:
     revisit_when:
       - Prime makes a user-facing turn abort cancel the child runs it owns, or exposes an equivalent turn-scoped cancellation contract.
       - Prime introduces a real detached or background spawn mode, which would need a per-child survival decision instead of one retained-versus-active rule.
->>>>>>> 4a393796c (fix: cascade requestAbort into active RLM child runs)