diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 1087211842..8d112b4138 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -1,11 +1,7 @@
 /obj/machinery/sleep_console
 	name = "sleeper console"
-<<<<<<< HEAD
-	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icon.
-=======
 	desc = "A control panel to operate a linked sleeper with."
-	icon = 'icons/obj/Cryogenic2.dmi'
->>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds
+	icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icon.
 	icon_state = "sleeperconsole"
 	var/obj/machinery/sleeper/sleeper
 	anchored = 1 //About time someone fixed this.