diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 2f4ff236d45..e37f2cae4ed 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -46,11 +46,7 @@
 			bulb = null
 			power_change()
 
-<<<<<<< HEAD
-	else if (istype(W, /obj/item/device/flash))
-=======
 	else if (istype(W, /obj/item/device/flash/handheld))
->>>>>>> 364898b... Fix cyborg flashes being useable in flashers and cyborg heads.
 		if (!bulb)
 			user.visible_message("<span class='notice'>[user] installs [W] into [src].</span>", "<span class='notice'>You install [W] into [src].</span>")
 			user.drop_item()
@@ -178,4 +174,4 @@
 	icon_state = "launcherbtt"
 	active = 0
 
-	return
\ No newline at end of file
+	return
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 05396c4ad5e..e2ff15d79ef 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -331,13 +331,8 @@
 
 /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob)
 	..()
-<<<<<<< HEAD
-	if(istype(W, /obj/item/device/flash))
-		var/obj/item/device/flash/F = W
-=======
 	if(istype(W, /obj/item/device/flash/handheld))
 		var/obj/item/device/flash/handheld/F = W
->>>>>>> 364898b... Fix cyborg flashes being useable in flashers and cyborg heads.
 		if(src.flash1 && src.flash2)
 			user << "<span class='notice'>You have already inserted the eyes!</span>"
 			return