diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 47099ed82b..8c4772f43a 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -45,14 +45,9 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 		return
 	if(usr.stat || usr.restrained() || !usr.canmove)
 		return
-<<<<<<< HEAD
-	src.setDir(turn(src.dir, 90))
-	return
-=======
 	setDir(turn(dir, -90))
 	to_chat(usr, "<span class='notice'>You adjust [src]'s dish to face to the [dir2text(dir)].</span>")
 	playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
->>>>>>> baddcf4... Merge pull request #32889 from ShizCalev/turn-consistency
 
 /obj/machinery/doppler_array/AltClick(mob/living/user)
 	if(!istype(user) || user.incapacitated())