diff --git a/code/modules/surgery/organs/subtypes/drask.dm b/code/modules/surgery/organs/subtypes/drask.dm
index f0db8c7878e..c5dd8d98d41 100644
--- a/code/modules/surgery/organs/subtypes/drask.dm
+++ b/code/modules/surgery/organs/subtypes/drask.dm
@@ -3,11 +3,7 @@
 	name = "drask organ"
 	icon = 'icons/obj/surgery_drask.dmi'
 	icon_state = "innards"
-<<<<<<< HEAD
 	desc = "A greenish, slightly translucent organ. It is extremely cold."
-=======
-	desc = "A greenish, slightly translucent organ. /red It is extremely cold."
->>>>>>> 46bd72ac5e61af45f173d2c705563ed10b898819
 
 /obj/item/organ/internal/heart/drask
 	name = "drask heart"