diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbc15aef9..98f1e39b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ Format based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Added
+- `ticket team` command and `--team` filter — comma-separated team assignment for tickets (server, client, joint, content)
+
 ### Fixed
 - `start-sprint` skill uses `git rev-parse --show-toplevel` for worktree-safe absolute paths — fixes "No such file or directory" errors on team branches
 
@@ -126,12 +129,9 @@ Format based on [Keep a Changelog](https://keepachangelog.com/).
 - Rejected alternatives R-004 through R-010 documented (pure Bevy, pure Godot, GDExtension, C++ GDExtension, Fyrox, custom framework, protobuf)
 
 ### Fixed
-<<<<<<< HEAD
 - create-skill references to nonexistent init_skill.py and package_skill.py scripts
-=======
 - SimBridge wire format: inputs now batch-encoded as Vec\<PlayerInput\> array per server protocol (was sending individual inputs per frame)
 - SimBridge server args: positional address format ("127.0.0.1:9876") matching server CLI, port default corrected to 9876
->>>>>>> origin/client
 - Wire format mismatch: LocalBridge now uses rmp_serde::to_vec_named() (named maps) matching client Protocol.gd expectations
 - EOF on bridge read now returns BridgeError::Transport for disconnect detection instead of empty Vec
 - WalkabilityMap rewritten from flat Vec to chunk-based HashMap per D-012 architecture (Tyre review)