diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm
index 2677a56536..209dc9ca9a 100644
--- a/code/modules/shieldgen/directional_shield.dm
+++ b/code/modules/shieldgen/directional_shield.dm
@@ -103,7 +103,7 @@
 	if(always_on)
 		create_shields()
 	GLOB.moved_event.register(src, src, .proc/moved_event)
-	..()
+	return ..()
 
 /obj/item/shield_projector/Destroy()
 	destroy_shields()
diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm
index 74db547fb2..403ec45374 100644
--- a/maps/submaps/engine_submaps/engine.dm
+++ b/maps/submaps/engine_submaps/engine.dm
@@ -3,7 +3,12 @@
 	name = "Engine Loader"
 	var/clean_turfs // A list of lists, where each list is (x, )
 
+<<<<<<< HEAD
 /obj/effect/landmark/engine_loader/New()
+=======
+INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader)
+/obj/effect/landmark/engine_loader/Initialize()
+>>>>>>> 2d43d031101... Merge pull request #8354 from Atermonera/fix_engineload
 	if(SSmapping.engine_loader)
 		warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]")
 		delete_me = TRUE