diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index a25010d2a0..7dc40872d5 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -77,18 +77,10 @@
 	external_type = /obj/item/robot_parts/robot_component/armour
 	max_damage = 90
 
-<<<<<<< HEAD
-||||||| parent of b3f3ea7c9d... Merge pull request #9974 from VOREStation/upstream-merge-7988
-/datum/robot_component/armour/platform
-	name = "platform armour plating"
-	external_type = /obj/item/robot_parts/robot_component/armour_platform
-	max_damage = 180
-=======
 /datum/robot_component/armour/platform
 	name = "platform armour plating"
 	external_type = /obj/item/robot_parts/robot_component/armour_platform
 	max_damage = 140
->>>>>>> b3f3ea7c9d... Merge pull request #9974 from VOREStation/upstream-merge-7988
 
 // ACTUATOR
 // Enables movement.
@@ -268,4 +260,4 @@
 /obj/item/robot_parts/robot_component/radio
 	name = "radio"
 	icon_state = "radio"
-	icon_state_broken = "radio_broken"
\ No newline at end of file
+	icon_state_broken = "radio_broken"