diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index b8c4534d55..9f1e522733 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -803,4 +803,3 @@
 	required_type = list(/obj/mecha/medical)
 
 	tooltype = /obj/item/device/healthanalyzer/advanced
->>>>>>> e2e870f... Medical Expansion (#6465)