diff --git a/tgui/src/interfaces/atmos_filter.ract b/tgui/src/interfaces/atmos_filter.ract
index 9b342f5b7c..bb48a78891 100644
--- a/tgui/src/interfaces/atmos_filter.ract
+++ b/tgui/src/interfaces/atmos_filter.ract
@@ -12,23 +12,6 @@
     <ui-button state='{{data.filter_type == "none" ? "selected" : null}}'
       action='filter' params='{"mode": ""}'>Nothing</ui-button>
     <ui-button state='{{data.filter_type == "plasma" ? "selected" : null}}'
-<<<<<<< HEAD
-      action='filter' params='{"mode": "plasma"}'>Plasma</ui-button>
-    <ui-button state='{{data.filter_type == "o2" ? "selected" : null}}'
-      action='filter' params='{"mode": "o2"}'>O2</ui-button>
-    <ui-button state='{{data.filter_type == "n2" ? "selected" : null}}'
-      action='filter' params='{"mode": "n2"}'>N2</ui-button>
-    <ui-button state='{{data.filter_type == "co2" ? "selected" : null}}'
-      action='filter' params='{"mode": "co2"}'>CO2</ui-button>
-    <ui-button state='{{data.filter_type == "n2o" ? "selected" : null}}'
-      action='filter' params='{"mode": "n2o"}'>N2O</ui-button>
-	<ui-button state='{{data.filter_type == "bz" ? "selected" : null}}'
-      action='filter' params='{"mode": "bz"}'>BZ</ui-button>	
-	<ui-button state='{{data.filter_type == "freon" ? "selected" : null}}'
-      action='filter' params='{"mode": "freon"}'>Freon</ui-button>	
-	<ui-button state='{{data.filter_type == "water_vapor" ? "selected" : null}}'
-      action='filter' params='{"mode": "water_vapor"}'>Water Vapor</ui-button>	
-=======
       action='filter' params='{"mode": "/datum/gas/plasma"}'>Plasma</ui-button>
     <ui-button state='{{data.filter_type == "o2" ? "selected" : null}}'
       action='filter' params='{"mode": "/datum/gas/oxygen"}'>O2</ui-button>
@@ -44,6 +27,5 @@
       action='filter' params='{"mode": "/datum/gas/freon"}'>Freon</ui-button>
 	<ui-button state='{{data.filter_type == "water_vapor" ? "selected" : null}}'
       action='filter' params='{"mode": "/datum/gas/water_vapor"}'>Water Vapor</ui-button>
->>>>>>> 945a58c... unfucks filters (#31599)
 	</ui-section>
 </ui-display>