diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index ba0265cc72..1fda536c93 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -135,14 +135,10 @@ var/global/list/limb_icon_cache = list()
 	if(owner && owner.gender == FEMALE)
 		gender = "f"
 
-<<<<<<< HEAD
-	icon_cache_key = "[icon_name]_[species ? species.get_bodytype() : SPECIES_HUMAN]" //VOREStation Edit
-=======
 	if(!force_icon_key)
-		icon_cache_key = "[icon_name]_[species ? species.name : SPECIES_HUMAN]"
+		icon_cache_key = "[icon_name]_[species ? species.get_bodytype() : SPECIES_HUMAN]" //VOREStation Edit
 	else
 		icon_cache_key = "[icon_name]_[force_icon_key]"
->>>>>>> 68b370b... Fresh Meat, Leatherworking (#7629)
 
 	if(force_icon)
 		mob_icon = new /icon(force_icon, "[icon_name][gendered_icon ? "_[gender]" : ""]")