diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 048cb85b9be..da86e4ee3cf 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -553,8 +553,5 @@
 	icon_state = "laptop"
 	icon_keyboard = "laptop_key"
 	icon_screen = "medlaptop"
-<<<<<<< HEAD
-=======
 	circuit = /obj/item/weapon/circuitboard/med_data/laptop
->>>>>>> 209cb36... Big Bugfix Bonanza (#6170)
-	density = 0
\ No newline at end of file
+	density = 0