diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
index 0e349f36cc..2a06ceec40 100644
--- a/code/modules/emotes/definitions/audible.dm
+++ b/code/modules/emotes/definitions/audible.dm
@@ -190,6 +190,8 @@
 	emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
 	emote_message_3p = "warbles."
 
+<<<<<<< HEAD
+=======
 /decl/emote/audible/croon
 	key = "croon"
 	emote_message_3p = "croons..."
@@ -200,11 +202,12 @@
 	emote_message_3p = "lets out a low, throaty warble!"
 	emote_sound = 'sound/voice/lwarble.ogg'
 
-/decl/emote/audible/croak
-	key = "croak"
+/decl/emote/audible/croak_skrell
+	key = "scroak"
 	emote_message_3p = "croaks!"
-	emote_sound = 'sound/voice/croak.ogg'
+	emote_sound = 'sound/voice/croak_skrell.ogg'
 
+>>>>>>> 7c14ead771... Merge pull request #14439 from Heroman3003/post-mirror-fixes
 /decl/emote/audible/vox_shriek
 	key = "shriek"
 	emote_message_3p = "SHRIEKS!"
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 76ffaccf80..2f3a8eac61 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -168,6 +168,13 @@ var/list/_human_default_emotes = list(
 	/decl/emote/visible/jiggle,
 	/decl/emote/visible/lightup,
 	/decl/emote/visible/vibrate,
+<<<<<<< HEAD
+=======
+	/decl/emote/audible/croon,
+	/decl/emote/audible/lwarble,
+	/decl/emote/audible/croak_skrell
+
+>>>>>>> 7c14ead771... Merge pull request #14439 from Heroman3003/post-mirror-fixes
 	//VOREStation Add End
 	//CHOMP Add start
 	/decl/emote/audible/prbt2
diff --git a/sound/voice/Croak.ogg b/sound/voice/Croak.ogg
deleted file mode 100644
index 54327a26fb..0000000000
Binary files a/sound/voice/Croak.ogg and /dev/null differ
diff --git a/sound/voice/croak.ogg b/sound/voice/croak.ogg
index e9dd96dafe..54327a26fb 100644
Binary files a/sound/voice/croak.ogg and b/sound/voice/croak.ogg differ
diff --git a/sound/voice/croak_skrell.ogg b/sound/voice/croak_skrell.ogg
new file mode 100644
index 0000000000..e9dd96dafe
Binary files /dev/null and b/sound/voice/croak_skrell.ogg differ
diff --git a/vorestation.dme b/vorestation.dme
index bd6db53795..27c5b53b70 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1780,6 +1780,7 @@
 #include "code\modules\admin\create_mob.dm"
 #include "code\modules\admin\create_object.dm"
 #include "code\modules\admin\create_turf.dm"
+#include "code\modules\admin\fix_player_notes_listing.dm"
 #include "code\modules\admin\holder2.dm"
 #include "code\modules\admin\IsBanned.dm"
 #include "code\modules\admin\map_capture.dm"