diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index 17ec2faa70..2e4caf1c33 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -111,12 +111,8 @@ h1.alert, h2.alert		{color: #000000;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}
 .terminus				{font-family: "Times New Roman", Times, serif, sans-serif}
 .interface				{color: #330033;}
-<<<<<<< HEAD
 .psionic                {color: #993399;}    /*YWedit*/
-||||||| parent of ae8e37f2ca... Merge pull request #9125 from Andromeda-K22/spacefam_speak
-=======
 .spacer					{color: #9c660b;}
->>>>>>> ae8e37f2ca... Merge pull request #9125 from Andromeda-K22/spacefam_speak
 
 BIG IMG.icon 			{width: 32px; height: 32px;}