diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 9c922fff855..08e22f96e0e 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -14,10 +14,6 @@
 	active_power_usage = 10000	//10 kW. It's a big all-body scanner.
 	light_color = "#00FF00"
 	var/obj/machinery/body_scanconsole/console
-<<<<<<< HEAD
-	var/known_implants = list(/obj/item/weapon/implant/health, /obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/language, /obj/item/weapon/implant/language/eal, /obj/item/weapon/implant/backup, /obj/item/device/nif) //VOREStation Add - Backup Implant, NIF
-=======
->>>>>>> 823d556... Merge pull request #7963 from MistakeNot4892/implants
 	var/printing_text = null
 
 /obj/machinery/bodyscanner/Initialize()
diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm
index a0ad5092b8a..4702e389af8 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -23,6 +23,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 	icon_state = "nif_0"
 
 	w_class = ITEMSIZE_TINY
+	known_implant = TRUE
 
 	var/durability = 100					// Durability remaining
 	var/bioadap = FALSE						// If it'll work in fancy species
diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm
index bcb87677213..b7fb3292382 100644
--- a/code/modules/resleeving/implant.dm
+++ b/code/modules/resleeving/implant.dm
@@ -11,6 +11,7 @@
 						/datum/category_item/catalogue/technology/resleeving)
 	icon = 'icons/vore/custom_items_vr.dmi'
 	icon_state = "backup_implant"
+	known_implant = TRUE
 
 /obj/item/weapon/implant/backup/get_data()
 	var/dat = {"