diff --git a/code/modules/events/weightless.dm b/code/modules/events/weightless.dm
index bb56d67afb..425ed7ef9f 100644
--- a/code/modules/events/weightless.dm
+++ b/code/modules/events/weightless.dm
@@ -1,37 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/weightless
-	name = "Gravity Systems Failure"
-	typepath = /datum/round_event/weightless
-	weight = 15
-
-/datum/round_event/weightless
-	startWhen = 5
-	endWhen = 65
-	announceWhen	= 1
-
-/datum/round_event/weightless/setup()
-	startWhen = rand(0,10)
-	endWhen = rand(40,80)
-
-/datum/round_event/weightless/announce()
-	command_alert("Warning: Failsafes for the station's artificial gravity arrays have been triggered. Please be aware that if this problem recurs it may result in formation of gravitational anomalies. Nanotrasen wishes to remind you that the unauthorised formation of anomalies within Nanotrasen facilities is strictly prohibited by health and safety regulation [rand(99,9999)][pick("a","b","c")]:subclause[rand(1,20)][pick("a","b","c")].")
-
-/datum/round_event/weightless/start()
-	for(var/area/A in world)
-		A.gravitychange(0)
-
-	if(control)
-		control.weight *= 2
-
-/datum/round_event/weightless/end()
-	for(var/area/A in world)
-		A.gravitychange(1)
-
-	if(announceWhen >= 0)
-		command_alert("Artificial gravity arrays are now functioning within normal parameters. Please report any irregularities to your respective head of staff.")
-
-
-=======
 /datum/round_event_control/weightless
 	name = "Gravity Systems Failure"
 	typepath = /datum/round_event/weightless
@@ -62,6 +28,3 @@
 
 	if(announceWhen >= 0)
 		command_alert("Artificial gravity arrays are now functioning within normal parameters. Please report any irregularities to your respective head of staff.")
-
-
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)