diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index 741ce1d3544..5d2deb079b6 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -568,27 +568,12 @@
 			var/list/info = alarm_area.air_scrub_info[id_tag]
 			if(!info)
 				continue
-<<<<<<< HEAD
-			var/list/list/filters = list()
-			scrubbers.Add(list(list(
-=======
 			scrubbers += list(list(
->>>>>>> a132767... Fixes unlocked air alarm uis (#8149)
 				"id_tag"	= id_tag,
 				"long_name" = sanitize(long_name),
 				"power"		= info["power"],
 				"scrubbing"	= info["scrubbing"],
 				"panic"		= info["panic"],
-<<<<<<< HEAD
-				"filters"	= filters
-			)))
-			filters.Add(list(list("name" = "Oxygen",			"command" = "o2_scrub",	"val" = info["filter_o2"])))
-			filters.Add(list(list("name" = "Nitrogen",			"command" = "n2_scrub",	"val" = info["filter_n2"])))
-			filters.Add(list(list("name" = "Carbon Dioxide", 	"command" = "co2_scrub","val" = info["filter_co2"])))
-			filters.Add(list(list("name" = "Toxin"	, 			"command" = "tox_scrub","val" = info["filter_phoron"])))
-			filters.Add(list(list("name" = "Nitrous Oxide",		"command" = "n2o_scrub","val" = info["filter_n2o"])))
-			filters.Add(list(list("name" = "Fuel",				"command" = "fuel_scrub","val" = info["filter_fuel"])))
-=======
 				"filters"   = list(
 					list("name" = "Oxygen",			"command" = "o2_scrub",	"val" = info["filter_o2"]),
 					list("name" = "Nitrogen",		"command" = "n2_scrub",	"val" = info["filter_n2"]),
@@ -599,7 +584,6 @@
 				)
 			))
 		data["scrubbers"] = scrubbers
->>>>>>> a132767... Fixes unlocked air alarm uis (#8149)
 
 		data["mode"] = mode
 		
@@ -815,4 +799,4 @@
 
 	TLV["temperature"] =	list(T0C - 40, T0C - 20, T0C + 40, T0C + 66) // K, Lower Temperature for Freezer Air Alarms (This is because TLV is hardcoded to be generated on first_run, and therefore the only way to modify this without changing TLV generation)
 
-// VOREStation Edit End
\ No newline at end of file
+// VOREStation Edit End