diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm
index 349a48c048..474b6ec8a5 100644
--- a/code/modules/catalogue/catalogue_data_vr.dm
+++ b/code/modules/catalogue/catalogue_data_vr.dm
@@ -58,11 +58,19 @@
 
 /datum/category_item/catalogue/fauna/vulpkanin
 	name = "Sapients - Vulpkanin"
+<<<<<<< HEAD
 	desc = "The vulpkanin are the remnants of an ancient precursor race, residing on a planet called \
 	“Altam”. Vulpkanin diverged from the precursors due to heavy isolation after the fall, \
 	presumably due to being a freshly found colony. A lack of material support regressed their technology \
 	to pre-industrial standards until being found again by humanity. At this point \
 	they have formed an early spacefaring society and smoothly entered the galacic stage. \
+=======
+	desc = "The Vulpkanin are the remnants of an ancient precursor which resided in the Coreward Periphery \
+	3000 to 4000 years ago, residing on a planet called “Altam”. Vulpkanin diverged from the precursors due \
+	to heavy isolation after the fall, presumably due to being a freshly found colony. A lack of material support \
+	regressed their technology to pre-industrial standards, from which they had to recover from in long and hard years. At the point \
+	of discovery by human explorers, they have formed an early interplanetary society and accession into the Diaspora went over relatively smoothly. \
+>>>>>>> f2a301858a2... Merge pull request #12100 from Heroman3003/vulplore
 	Vulpkanin are the closest successor to the precursors, genetically, although genelocked devices still do not \
 	recognize them due to genetic drift." //CHOMpedit
 	value = CATALOGUER_REWARD_TRIVIAL
diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
index 3438f8b0c9..7b194e500c 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
@@ -226,6 +226,10 @@
 /datum/species/vulpkanin
 	name = SPECIES_VULPKANIN
 	name_plural = "Vulpkanin"
+	blurb = "Vulpkanin are a species of sapient canine bipeds, who are the descendants of a lost colony during the waning days of a Precursor species, \
+	from which their distant cousins, the Zorren, also originate from. Independent and iconoclast, they have abandoned the ideals of their forefathers \
+	largely and prefer to look outwards as explorers and scientists to forge their own identity. They speak a guttural language known as 'Canilunzt' \
+	which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent."
 	icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
 	deform = 'icons/mob/human_races/r_vulpkanin.dmi'
 //	path = /mob/living/carbon/human/vulpkanin
@@ -243,6 +247,7 @@
 	inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds,
 		/mob/living/carbon/human/proc/tie_hair)
 
+<<<<<<< HEAD
 	male_scream_sound = null //CHOMPedit
 	female_scream_sound = null //CHOMPedit
 
@@ -254,6 +259,9 @@
 
 //CHOMPStation Removal
 //	wikilink="https://www.yawn.ocry.com/Vulpkanin"
+=======
+	wikilink="https://wiki.vore-station.net/Backstory#Vulpkanin"
+>>>>>>> f2a301858a2... Merge pull request #12100 from Heroman3003/vulplore
 
 	catalogue_data = list(/datum/category_item/catalogue/fauna/vulpkanin)