From e9dbe2b58536de6e7f2627234df074c546f11c1d Mon Sep 17 00:00:00 2001
From: cadyn <35672377+cadyn@users.noreply.github.com>
Date: Sat, 27 Feb 2021 15:00:16 -0800
Subject: [PATCH] Update 07_traits.dm

---
 .../client/preference_setup/vore/07_traits.dm    | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index 2de4413216..8af6e9f74b 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -282,23 +282,9 @@
 
 			var/conflict = FALSE
 
-<<<<<<< HEAD
-			user.isSynthetic()	//Recheck just to be sure
-			if(pref.dirty_synth && instance.not_for_synths)//if you are a synth you can't take this trait.
-				alert("You cannot take this trait as a SYNTH.\
-				Please remove that trait, or pick another trait to add.","Error")
-				//pref.dirty_synth = 0	//Just to be sure // Commented out because it allow for someone to take a synth-blacklisted trait CHOMP Edit
-||||||| parent of 8b0c23c122... Merge pull request #9659 from KillianKirilenko/kk-misc4
-			user.isSynthetic()	//Recheck just to be sure
-			if(pref.dirty_synth && instance.not_for_synths)//if you are a synth you can't take this trait.
-				alert("You cannot take this trait as a SYNTH.\
-				Please remove that trait, or pick another trait to add.","Error")
-				pref.dirty_synth = 0	//Just to be sure
-=======
 			if(pref.dirty_synth && !(instance.can_take & SYNTHETICS))
 				alert("The trait you've selected can only be taken by organic characters!","Error")
-				pref.dirty_synth = 0	//Just to be sure
->>>>>>> 8b0c23c122... Merge pull request #9659 from KillianKirilenko/kk-misc4
+				//pref.dirty_synth = 0	//Just to be sure //CHOMPEdit this shit broke, stop.
 				return TOPIC_REFRESH
 
 			if(pref.gross_meatbag && !(instance.can_take & ORGANICS))