diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 40bd739711..d5e2b1be4c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28271,7 +28271,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   silicons:
   - tweak: you can now shove yourself up in any intent, not just help.
 2021-01-27:
-<<<<<<< HEAD
   ArcaneMusic, ported by Hatterhat:
   - rscadd: Strike a hydroponics tray with a fully-charged floral somatoray to lock
       in a mutation.
@@ -28370,6 +28369,4 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Hatterhat:
   - bugfix: The green energy sabre's sprite now respects proper handedness.
 =======
-  raspy-on-osu:
-  - bugfix: bespoke ventcrawling element not detaching due to malformed call
->>>>>>> a704286c2d... Automatic changelog compile [ci skip]
+>>>>>>> 5ad3b97dc1... yesss?