/obj/merge_conflict_marker
	name = "MERGE CONFLICT MARKER"
	icon = 'icons/effects/map_effects.dmi'
	icon_state = "portal_projection_side_b"
	layer = AREA_LAYER