diff --git a/html/changelog.html b/html/changelog.html
index 55642e2b675..98a7dd6376e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -43,6 +43,10 @@
 				<li class="rscadd">Point Verdant: hotel.</li>
 				<li class="maptweak">Rearranges Intrepid layout a bit.</li>
 			</ul>
+			<h3 class="author">FluffyGhost updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Set the python version so that there is a release for windows, for mapmerge2.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed exosuits not getting access from guest pass cards.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0d871eb870c..cfd679fa88f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -31755,6 +31755,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: K&#x27;ois bars added to the list of vaurca lunchbox snacks.
   - rscadd: 'Point Verdant: hotel.'
   - maptweak: Rearranges Intrepid layout a bit.
+  FluffyGhost:
+  - bugfix: Set the python version so that there is a release for windows, for mapmerge2.
   Geeves:
   - bugfix: Fixed exosuits not getting access from guest pass cards.
   GeneralCamo, Lexorion:
diff --git a/html/changelogs/fluffyghost-mapmerge2windowsfix.yml b/html/changelogs/fluffyghost-mapmerge2windowsfix.yml
deleted file mode 100644
index d8716ab8c7f..00000000000
--- a/html/changelogs/fluffyghost-mapmerge2windowsfix.yml
+++ /dev/null
@@ -1,41 +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: "Set the python version so that there is a release for windows, for mapmerge2."