me avoid merge conflict

_maps/map_files/generic/centcomm.dmm

@@ -6353,6 +6353,12 @@
 /obj/item/dice/d20,
 /turf/simulated/floor/wood,
 /area/trader_station/sol)
+"vC" = (
+/obj/machinery/photocopier/faxmachine/longrange{
+	department = "Central Command"
+	},
+/turf/simulated/floor/plasteel,
+/area/admin)
 "vD" = (
 /obj/structure/railing,
 /obj/effect/landmark/spawner/trader,
@@ -6899,6 +6905,12 @@
 	icon_state = "white"
 	},
 /area/centcom/control)
+"xx" = (
+/obj/machinery/photocopier/faxmachine/longrange/syndie{
+	department = "Syndicate"
+	},
+/turf/simulated/floor/plasteel,
+/area/admin)
 "xy" = (
 /obj/structure/bookcase/random,
 /obj/machinery/light/small,
@@ -8987,7 +8999,7 @@
 /obj/structure/table/wood,
 /obj/machinery/photocopier{
 	icon_state = "fax";
-	name = "fax machine"
+	name = "fake fax machine"
 	},
 /obj/item/photo{
 	name = "butts"
@@ -69399,7 +69411,7 @@ vH
 lZ
 wR
 wk
-lZ
+vC
 lZ
 lZ
 lZ
@@ -69656,7 +69668,7 @@ lZ
 lZ
 lZ
 wk
-lZ
+xx
 lZ
 lZ
 lZ