WIP fix of this PR

code/controllers/autotransfer.dm

@@ -3,13 +3,9 @@ var/datum/controller/transfer_controller/transfer_controller
 /datum/controller/transfer_controller
 	var/timerbuffer = 0 //buffer for time check
 	var/currenttick = 0
-<<<<<<< HEAD
 	var/shift_hard_end = 0 //VOREStation Edit
 	var/shift_last_vote = 0 //VOREStation Edit
-datum/controller/transfer_controller/New()
-=======
 /datum/controller/transfer_controller/New()
->>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)
 	timerbuffer = config.vote_autotransfer_initial
 	shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * 0) //VOREStation Edit //Change this "1" to how many extend votes you want there to be.
 	shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit

code/controllers/communications.dm

@@ -192,14 +192,8 @@ var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ)
 //Department channels, arranged lexically
 var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ)
 
-<<<<<<< HEAD
 var/list/OFFMAP_FREQS = list(TALON_FREQ) //VOREStation Add
 
-#define TRANSMISSION_WIRE	0
-#define TRANSMISSION_RADIO	1
-
-=======
->>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)
 /proc/frequency_span_class(var/frequency)
 	// Antags!
 	if (frequency in ANTAG_FREQS)

code/controllers/subsystems/lighting.dm

@@ -86,29 +86,6 @@ SUBSYSTEM_DEF(lighting)
 		queue.Cut(1, i+1)
 
 
-<<<<<<< HEAD
 /datum/controller/subsystem/lighting/Recover()
 	subsystem_initialized = SSlighting.subsystem_initialized
 	..()
-=======
-		DUAL_TICK_CHECK
-
-/datum/controller/subsystem/lighting/stat_entry(msg_prefix)
-	var/list/msg = list(msg_prefix)
-	msg += "T:{"
-	msg += "S [total_lighting_sources] | "
-	msg += "C [total_lighting_corners] | "
-	msg += "O [total_lighting_overlays]"
-	msg += "}"
-	msg += "C:{"
-	msg += "S [round(cost_lights, 1)] | "
-	msg += "C [round(cost_corners, 1)] | "
-	msg += "O [round(cost_overlays, 1)]"
-	msg += "}"
-	..(msg.Join())
-
-#undef DUAL_TICK_CHECK
-#undef SSLIGHTING_STAGE_LIGHTS
-#undef SSLIGHTING_STAGE_CORNERS
-#undef SSLIGHTING_STAGE_OVERLAYS
->>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)