From 054c48d0e5ba5c72ecebad9730cf98635c433c1d Mon Sep 17 00:00:00 2001
From: mdheller <21163552+mdheller@users.noreply.github.com>
Date: Wed, 8 Apr 2026 14:49:38 -0400
Subject: [PATCH] chore: document merge conflict remediation

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b60df6d..0eb6b27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). Thi
 
 ### Fixed
 - `schemas/README.md` used `urn:sourceos:` prefix — corrected to `urn:srcos:` throughout
+- Resolved cross-branch merge conflicts across core docs/specs/examples and agent-plane schemas to restore a clean, mergeable branch state
 
 ---