From b865bf8f1253d4e0d003d7f16a64fc17a91bdde2 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 11 Mar 2021 15:25:27 -0500
Subject: [PATCH] Update organ_icon.dm

---
 code/modules/organs/organ_icon.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index b04f04eeba..6239577b8d 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -122,11 +122,7 @@ var/global/list/limb_icon_cache = list()
 		if(facial_hair_style && facial_hair_style.species_allowed && (species.get_bodytype(owner) in facial_hair_style.species_allowed))
 			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
 			if(facial_hair_style.do_colouration)
-<<<<<<< HEAD
-				facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_MULTIPLY) // VOREStation edit
-=======
 				facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), facial_hair_style.color_blend_mode)
->>>>>>> 928badc... Merge pull request #7788 from Atermonera/beard_color
 			res.add_overlay(facial_s)
 
 	//Head hair