diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index a2e3818577..ec46fcd291 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -81,12 +81,8 @@
else
icon_state = "[initial(icon_state)]"
-<<<<<<< HEAD
-/obj/machinery/disco/interact(mob/user)
-=======
/obj/machinery/jukebox/ui_interact(mob/user)
. = ..()
->>>>>>> 4471461... Refactors Dance Machine + deletes a bunch of sound files (#36815)
if (!anchored)
to_chat(user,"This device must be anchored by a wrench!")
return
@@ -96,14 +92,10 @@
return
if(!Adjacent(user) && !isAI(user))
return
-<<<<<<< HEAD
- user.set_machine(src)
-=======
if(!songs.len)
to_chat(user,"Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.")
playsound(src,'sound/misc/compiler-failure.ogg', 25, 1)
return
->>>>>>> 4471461... Refactors Dance Machine + deletes a bunch of sound files (#36815)
var/list/dat = list()
dat +="