diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 533975c8979..7db384ddc70 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1215,9 +1215,6 @@
 
 		if(current_selection_index) // Select what the player had before if possible.
 			select_module(current_selection_index)
-<<<<<<< HEAD
-=======
 
 /mob/living/silicon/robot/get_cell()
 	return cell
->>>>>>> f383438... Merge pull request #7935 from MistakeNot4892/tachikoma