diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
index aac4651045..b9ca364883 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
@@ -12,14 +12,8 @@
 		SPECIES_FENNEC 			= 'icons/mob/species/vulpkanin/helmet.dmi',
 		SPECIES_PROMETHEAN		= 'icons/mob/species/skrell/helmet.dmi',
 		SPECIES_VOX 			= 'icons/mob/species/vox/head.dmi',
-<<<<<<< HEAD
-		SPECIES_TESHARI         = 'icons/mob/species/seromi/head.dmi',
+		SPECIES_TESHARI         = 'icons/mob/species/teshari/head.dmi',
 		SPECIES_GREY_YW         = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/
-||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
-		SPECIES_TESHARI 		= 'icons/mob/species/seromi/head.dmi'
-=======
-		SPECIES_TESHARI 		= 'icons/mob/species/teshari/head.dmi'
->>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
 		)