new->init refactor

code/modules/overmap/ships/computers/ship.dm

@@ -7,8 +7,6 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 	var/obj/effect/overmap/visitable/ship/linked
 	var/list/viewers // Weakrefs to mobs in direct-view mode.
 	var/extra_view = 0 // how much the view is increased by when the mob is in overmap mode.
-<<<<<<< HEAD
-=======
 	var/list/whitelisted_types = list(/obj/effect/overmap/visitable/ship)
 	var/list/blacklisted_types = list()
 
@@ -20,7 +18,6 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 	for(var/type in blacklisted_types)
 		L -= typesof(type)
 	whitelisted_types = L
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 
 // A late init operation called in SSshuttles, used to attach the thing to the right ship.
 /obj/machinery/computer/ship/proc/attempt_hook_up(obj/effect/overmap/visitable/ship/sector)