new->init refactor

code/modules/lighting/lighting_atom.dm

@@ -91,11 +91,9 @@
 		else
 			light = new/datum/light_source(src, .)
 
-<<<<<<< HEAD
-=======
+
 /atom/Initialize()
 	. = ..()
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 
 /**
  * Updates the atom's opacity value.

code/modules/lighting/lighting_overlay.dm

@@ -5,7 +5,6 @@
 	///whether we are already in the SSlighting.objects_queue list
 	var/needs_update = FALSE
 
-<<<<<<< HEAD
 	///the turf that our light is applied to
 	var/turf/affected_turf
 
@@ -20,17 +19,6 @@
 	. = ..()
 
 	current_underlay = mutable_appearance(LIGHTING_ICON, "transparent", source.z, PLANE_LIGHTING, 255, RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM)
-=======
-/atom/movable/lighting_overlay/Initialize(var/ml, var/no_update = FALSE)
-	. = ..(ml)
-	verbs.Cut()
-	total_lighting_overlays++
-	var/turf/T = loc //If this runtimes atleast we'll know what's creating overlays outside of turfs.
-	T.lighting_overlay = src
-	T.luminosity = 0
-	if(!no_update)
-		update_overlay()
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 
 	affected_turf = source
 	if (affected_turf.lighting_object)