diff --git a/code/modules/client/preference_setup/vore/03_egg.dm b/code/modules/client/preference_setup/vore/03_egg.dm
index 6bb5c3ece6..5ad651fbf9 100644
--- a/code/modules/client/preference_setup/vore/03_egg.dm
+++ b/code/modules/client/preference_setup/vore/03_egg.dm
@@ -1,15 +1,4 @@
 // Define a place to save appearance in character setup
-<<<<<<< HEAD
-// CHOMPStation Add Start: Doing this here bc AUTOHISS_FULL is more readable than #
-#define AUTOHISS_OFF 0
-#define AUTOHISS_BASIC 1
-#define AUTOHISS_FULL 2
-// CHOMPStation Add End
-
-/datum/preferences
-	var/vore_egg_type = "Egg" //The egg type they have.
-	var/autohiss = "Full"			// CHOMPStation Add: Whether we have Autohiss on. I'm hijacking the egg panel bc this one has a shitton of unused space.
-=======
 // VOREStation Add Start: Doing this here bc AUTOHISS_FULL is more readable than #
 #define AUTOHISS_OFF 0
 #define AUTOHISS_BASIC 1
@@ -19,7 +8,6 @@
 /datum/preferences
 	var/vore_egg_type = "Egg" //The egg type they have.
 	var/autohiss = "Full"			// VOREStation Add: Whether we have Autohiss on. I'm hijacking the egg panel bc this one has a shitton of unused space.
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 
 // Definition of the stuff for the egg type.
 /datum/category_item/player_setup_item/vore/egg
@@ -28,30 +16,18 @@
 
 /datum/category_item/player_setup_item/vore/egg/load_character(var/savefile/S)
 	S["vore_egg_type"]		>> pref.vore_egg_type
-<<<<<<< HEAD
-	S["autohiss"]			>> pref.autohiss // CHOMPStation Add
-
-/datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S)
-	S["vore_egg_type"]		<< pref.vore_egg_type
-	S["autohiss"]			<< pref.autohiss // CHOMPStation Add
-=======
 	S["autohiss"]			>> pref.autohiss // VOREStation Add
 
 /datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S)
 	S["vore_egg_type"]		<< pref.vore_egg_type
 	S["autohiss"]			<< pref.autohiss // VOREStation Add
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 
 /datum/category_item/player_setup_item/vore/egg/sanitize_character()
 	pref.vore_egg_type	 = sanitize_inlist(pref.vore_egg_type, global_vore_egg_types, initial(pref.vore_egg_type))
 
 /datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character)
 	character.vore_egg_type	= pref.vore_egg_type
-<<<<<<< HEAD
-	// CHOMPStation Add
-=======
 	// VOREStation Add
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 	if(pref.client) // Safety, just in case so we don't runtime.
 		if(!pref.autohiss)
 			pref.client.autohiss_mode = AUTOHISS_FULL
@@ -63,20 +39,12 @@
 					pref.client.autohiss_mode = AUTOHISS_BASIC
 				if("Off")
 					pref.client.autohiss_mode = AUTOHISS_OFF
-<<<<<<< HEAD
-	// CHOMPStation Add
-=======
 	// VOREStation Add
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 
 /datum/category_item/player_setup_item/vore/egg/content(var/mob/user)
 	. += "<br>"
 	. += " Egg Type: <a href='?src=\ref[src];vore_egg_type=1'>[pref.vore_egg_type]</a><br>"
-<<<<<<< HEAD
-	. += "<b>Autohiss Default Setting:</b> <a href='?src=\ref[src];autohiss=1'>[pref.autohiss]</a><br>" // CHOMPStation Add
-=======
 	. += "<b>Autohiss Default Setting:</b> <a href='?src=\ref[src];autohiss=1'>[pref.autohiss]</a><br>" // VOREStation Add
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 
 /datum/category_item/player_setup_item/vore/egg/OnTopic(var/href, var/list/href_list, var/mob/user)
 	if(!CanUseTopic(user))
@@ -88,11 +56,7 @@
 		if(selection)
 			pref.vore_egg_type = selection
 			return TOPIC_REFRESH
-<<<<<<< HEAD
-	// CHOMPStation Add Start
-=======
 	// VOREStation Add Start
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 	else if(href_list["autohiss"])
 		var/list/autohiss_selection = list("Full", "Basic", "Off")
 		var/selection = tgui_input_list(user, "Choose your default autohiss setting:", "Character Preference", autohiss_selection, pref.autohiss)
@@ -101,17 +65,6 @@
 		else if(!selection)
 			pref.autohiss = "Full"
 		return TOPIC_REFRESH
-<<<<<<< HEAD
-	// CHOMPStation Add End
-	else
-		return
-
-// CHOMPStation Add Start: Doing this here bc AUTOHISS_FULL is more readable than #
-#undef AUTOHISS_OFF
-#undef AUTOHISS_BASIC
-#undef AUTOHISS_FULL
-// CHOMPStation Add End
-=======
 	// VOREStation Add End
 	else
 		return
@@ -121,4 +74,3 @@
 #undef AUTOHISS_BASIC
 #undef AUTOHISS_FULL
 // VOREStation Add End
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 0b6ac1cb63..367c8d457e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -684,20 +684,12 @@
 			var/datum/language/keylang = GLOB.all_languages[client.prefs.language_custom_keys[key]]
 			if(keylang)
 				new_character.language_keys[key] = keylang
-<<<<<<< HEAD
-	// CHOMPStation Add: Preferred Language Setting;
-=======
 	// VOREStation Add: Preferred Language Setting;
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 	if(client.prefs.preferred_language) // Do we have a preferred language?
 		var/datum/language/def_lang = GLOB.all_languages[client.prefs.preferred_language]
 		if(def_lang)
 			new_character.default_language = def_lang
-<<<<<<< HEAD
-	// CHOMPStation Add End
-=======
 	// VOREStation Add End
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 	// And uncomment this, too.
 	//new_character.dna.UpdateSE()
 
diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm
index 3637b0c324..1bb86274d7 100644
--- a/code/modules/resleeving/autoresleever.dm
+++ b/code/modules/resleeving/autoresleever.dm
@@ -172,20 +172,12 @@
 			var/datum/language/keylang = GLOB.all_languages[ghost_client.prefs.language_custom_keys[key]]
 			if(keylang)
 				new_character.language_keys[key] = keylang
-<<<<<<< HEAD
-	// CHOMPStation Add: Preferred Language Setting;
-=======
 	// VOREStation Add: Preferred Language Setting;
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 	if(ghost_client.prefs.preferred_language) // Do we have a preferred language?
 		var/datum/language/def_lang = GLOB.all_languages[ghost_client.prefs.preferred_language]
 		if(def_lang)
 			new_character.default_language = def_lang
-<<<<<<< HEAD
-	// CHOMPStation Add End
-=======
 	// VOREStation Add End
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 
 	//If desired, apply equipment.
 	if(equip_body)
diff --git a/code/modules/vore/eating/inbelly_spawn.dm b/code/modules/vore/eating/inbelly_spawn.dm
index 38634b3153..50c2c3168b 100644
--- a/code/modules/vore/eating/inbelly_spawn.dm
+++ b/code/modules/vore/eating/inbelly_spawn.dm
@@ -166,20 +166,12 @@ Please do not abuse this ability.
 			var/datum/language/keylang = GLOB.all_languages[prey.prefs.language_custom_keys[key]]
 			if(keylang)
 				new_character.language_keys[key] = keylang
-<<<<<<< HEAD
-	// CHOMPStation Add: Preferred Language Setting;
-=======
 	// VOREStation Add: Preferred Language Setting;
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 	if(prey.prefs.preferred_language) // Do we have a preferred language?
 		var/datum/language/def_lang = GLOB.all_languages[prey.prefs.preferred_language]
 		if(def_lang)
 			new_character.default_language = def_lang
-<<<<<<< HEAD
-	// CHOMPStation Add End
-=======
 	// VOREStation Add End
->>>>>>> 657ee05f13... Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
 
 	new_character.regenerate_icons()