diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css
index 6c0a4e4067..abf9ebec44 100644
--- a/code/modules/vchat/css/ss13styles.css
+++ b/code/modules/vchat/css/ss13styles.css
@@ -172,11 +172,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
 .spacer					{color: #9c660b;} /* VOREStation Add */
-=======
 .blob					{color: #ff950d; font-weight: bold; font-style: italic;}
->>>>>>> 89adcb0... Blob Genesis (#7781)
 
 .black					{color: #000000;}
 .darkgray				{color: #808080;}