From ccc780ef50fce5e212cb1e9fddf999080ef27905 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:34:50 +0000
Subject: [PATCH] my brain

---
 code/modules/mapping/merge_conflicts.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm
index f81b0a71dcd8..ad1a3ba6730e 100644
--- a/code/modules/mapping/merge_conflicts.dm
+++ b/code/modules/mapping/merge_conflicts.dm
@@ -12,6 +12,5 @@
 /obj/merge_conflict_marker/Initialize(mapload)
 	. = ..()
 	var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(src)]! Please manually address all potential merge conflicts!!!"
-	log_mapping(msg)
-	to_chat(world, span_boldannounce("[msg]"))
+	to_chat(world, SPAN_BOLDANNOUNCE("[msg]"))
 	warning(msg)