diff --git a/code/game/objects/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm
index 577e6166970..45cfd8622d1 100644
--- a/code/game/objects/effects/decals/posters/polarisposters.dm
+++ b/code/game/objects/effects/decals/posters/polarisposters.dm
@@ -297,12 +297,9 @@
 	icon_state = "ntposter04"
 	name = "Beware Aetotheans"
 	desc = "This poster displays a distinctly hostile-looking red Promethean in a black coat. The fine-print around the edges warns the reader about the dangers posed by Almachi Prometheans."
-<<<<<<< HEAD
+	listing_name = "Safety - Aetothean Danger"
 */
 //VOREstation Removal End
-=======
-	listing_name = "Safety - Aetothean Danger"
->>>>>>> 3cad364... Merge pull request #7865 from Cerebulon/individualposters
 
 /datum/poster/nanotrasen/nt_5
 	icon_state = "ntposter05"
@@ -334,4 +331,4 @@
 	icon_state = "ntposter09"
 	name = "Regulations and You"
 	desc = "This SifGov poster showcases an NT security guard reading from her PDA. The blurb advocates for the reader to keep corporate regulations in mind at all times, as an emergency can occur at any time."
-	listing_name = "Safety - Corporate Regulations"
\ No newline at end of file
+	listing_name = "Safety - Corporate Regulations"