diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 4ac1611..61badf3 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -12,7 +12,7 @@
     {
       "name": "compound-engineering",
       "description": "AI-powered development tools that get smarter with every use. Make each unit of engineering work easier than the last. Includes 27 specialized agents, 20 commands, and 12 skills.",
-      "version": "2.20.0",
+      "version": "2.21.0",
       "author": {
         "name": "Kieran Klaassen",
         "url": "https://github.com/kieranklaassen",
diff --git a/plugins/compound-engineering/.claude-plugin/plugin.json b/plugins/compound-engineering/.claude-plugin/plugin.json
index 85385bd..3ec91dc 100644
--- a/plugins/compound-engineering/.claude-plugin/plugin.json
+++ b/plugins/compound-engineering/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "compound-engineering",
-  "version": "2.20.0",
+  "version": "2.21.0",
   "description": "AI-powered development tools. 27 agents, 20 commands, 12 skills, 2 MCP servers for code review, research, design, and workflow automation.",
   "author": {
     "name": "Kieran Klaassen",
diff --git a/plugins/compound-engineering/CHANGELOG.md b/plugins/compound-engineering/CHANGELOG.md
index 7b97381..a90aa5a 100644
--- a/plugins/compound-engineering/CHANGELOG.md
+++ b/plugins/compound-engineering/CHANGELOG.md
@@ -5,29 +5,37 @@ All notable changes to the compound-engineering plugin will be documented in thi
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.21.0] - 2026-01-05
+
+### Fixed
+
+- Version history cleanup after merge conflict resolution
+
+### Summary
+
+This release consolidates all recent work:
+- `/feature-video` command for recording PR demos
+- `/deepen-plan` command for enhanced planning
+- `create-agent-skills` skill rewrite (official spec compliance)
+- `agent-native-architecture` skill major expansion
+- `dhh-rails-style` skill consolidation (merged dhh-ruby-style)
+- 27 agents, 20 commands, 12 skills, 2 MCP servers
+
+---
+
 ## [2.20.0] - 2026-01-05
 
 ### Added
 
-- **`/feature-video` command** - Record video walkthroughs of features using Playwright. Captures screenshots during browser interactions, generates GIF/MP4 videos, supports upload to transfer.sh or manual upload, and automatically updates PR descriptions with embedded demos. Perfect for documenting UI changes in pull requests.
+- **`/feature-video` command** - Record video walkthroughs of features using Playwright
 
 ### Changed
 
-- **`create-agent-skills` skill** - Complete rewrite to match Anthropic's official skill specification:
-  - **Format change**: Skills now use standard markdown headings (`## Quick Start`, `## Instructions`), NOT XML tags. The previous version incorrectly recommended XML tags which is not the official format.
-  - **Naming convention**: Updated to use gerund form (`creating-agent-skills`, `processing-pdfs`) per official spec
-  - **Description format**: Must be third person, include both what and when to use
-  - Added `references/official-spec.md` - Anthropic's official skill specification from code.claude.com/docs/en/skills
-  - Added `references/best-practices.md` - Skill authoring best practices from platform.claude.com
-  - Removed obsolete `references/use-xml-tags.md` - this was incorrect guidance
+- **`create-agent-skills` skill** - Complete rewrite to match Anthropic's official skill specification
 
 ### Removed
 
-- **`dhh-ruby-style` skill** - Merged into `dhh-rails-style` skill. All content consolidated into the single comprehensive Rails style guide.
-
-### Philosophy
-
-This update aligns the skill with Anthropic's official documentation. The key insight: **Skills are prompts**. All standard prompting best practices apply. Use standard markdown, not custom XML tags. Keep SKILL.md under 500 lines with progressive disclosure to reference files.
+- **`dhh-ruby-style` skill** - Merged into `dhh-rails-style` skill
 
 ---