diff --git a/html/changelog.html b/html/changelog.html
index 9441426a64f..2a026c32496 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,8 @@ <h3 class="author">FluffyGhost updated:</h3>
 				<li class="backend">Fixed all the editorconfig mismatches one last time.</li>
 				<li class="bugfix">Fixed air controller temperature input.</li>
 				<li class="backend">DMdoc for the temperature defines that are used to convert to/from Kelvin to/from Celsius.</li>
+				<li class="bugfix">Fixed AI not being able to interact with APC power channels, the borgs still remain locked out of it.</li>
+				<li class="bugfix">Resolved a runtime on AI spawn when trying to pick a custom sprite from an empty list of custom sprites.</li>
 			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 933ea734414..4eb186505b4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -32183,6 +32183,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed air controller temperature input.
   - backend: DMdoc for the temperature defines that are used to convert to/from Kelvin
       to/from Celsius.
+  - bugfix: Fixed AI not being able to interact with APC power channels, the borgs
+      still remain locked out of it.
+  - bugfix: Resolved a runtime on AI spawn when trying to pick a custom sprite from
+      an empty list of custom sprites.
   Geeves:
   - rscadd: Lings gain a new free ability called Emergency Transform, where their
       heads detach from their bodies. They can grow back to normal after 10 minutes
diff --git a/html/changelogs/fluffyghost-fixaiapcpowerchannels.yml b/html/changelogs/fluffyghost-fixaiapcpowerchannels.yml
deleted file mode 100644
index 1172c6e0560..00000000000
--- a/html/changelogs/fluffyghost-fixaiapcpowerchannels.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: FluffyGhost
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - bugfix: "Fixed AI not being able to interact with APC power channels, the borgs still remain locked out of it."
-  - bugfix: "Resolved a runtime on AI spawn when trying to pick a custom sprite from an empty list of custom sprites."