diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 3d71922bd68..f797a848ce9 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,7 +1,5 @@
 # @atproto/bsky
 
-# <<<<<<< HEAD
-
 ## 0.0.10
 
 ### Patch Changes
@@ -9,8 +7,6 @@
 - Updated dependencies [[`35b616cd`](https://github.com/bluesky-social/atproto/commit/35b616cd82232879937afc88d3f77d20c6395276)]:
   - @atproto/api@0.6.19
 
-> > > > > > > main
-
 ## 0.0.9
 
 ### Patch Changes
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index d0771fdb359..1bc9601f4c9 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,7 +1,5 @@
 # @atproto/dev-env
 
-# <<<<<<< HEAD
-
 ## 0.2.10
 
 ### Patch Changes
@@ -11,8 +9,6 @@
   - @atproto/bsky@0.0.10
   - @atproto/pds@0.1.19
 
-> > > > > > > main
-
 ## 0.2.9
 
 ### Patch Changes
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 2d4b22b519d..88c86c867d1 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,7 +1,5 @@
 # @atproto/pds
 
-# <<<<<<< HEAD
-
 ## 0.1.19
 
 ### Patch Changes
@@ -9,8 +7,6 @@
 - Updated dependencies [[`35b616cd`](https://github.com/bluesky-social/atproto/commit/35b616cd82232879937afc88d3f77d20c6395276)]:
   - @atproto/api@0.6.19
 
-> > > > > > > main
-
 ## 0.1.18
 
 ### Patch Changes