diff --git a/baystation12.dme b/baystation12.dme
index d0d57470337..59d973971a0 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1401,8 +1401,8 @@
 #include "code\ZAS\FEA_system.dm"
 #include "code\ZAS\Fire.dm"
 #include "code\ZAS\Functions.dm"
-#include "code\ZAS\NewSettings.dm"
 #include "code\ZAS\Plasma.dm"
+#include "code\ZAS\Variable Settings.dm"
 #include "code\ZAS\ZAS_Turfs.dm"
 #include "code\ZAS\ZAS_Zones.dm"
 #include "interface\interface.dm"
diff --git a/code/ZAS/FEA_gas_mixture.dm b/code/ZAS/FEA_gas_mixture.dm
index 6cc540c8151..26df46c5812 100644
--- a/code/ZAS/FEA_gas_mixture.dm
+++ b/code/ZAS/FEA_gas_mixture.dm
@@ -17,15 +17,8 @@ What are the archived variables for?
 #define TEMPERATURE_ICE_FORMATION 273.15 // 273 kelvin is the freezing point of water.
 #define MIN_PRESSURE_ICE_FORMATION 10 // 10kPa should be okay
 
-<<<<<<< HEAD
-#define GRAPHICS_PLASMA   1
-#define GRAPHICS_N2O      2
-#define GRAPHICS_REAGENTS 4  // Not used.  Yet.
-#define GRAPHICS_COLD     8
 
 
-=======
->>>>>>> parent of 0227baa... Reverting ZAS back to /vg/ style
 /datum/gas/sleeping_agent/specific_heat = 40 //These are used for the "Trace Gases" stuff, but is buggy.
 
 /datum/gas/oxygen_agent_b/specific_heat = 300
@@ -203,18 +196,6 @@ What are the archived variables for?
 	//Inputs: None
 	//Outputs: 1 if graphic changed, 0 if unchanged
 
-<<<<<<< HEAD
-
-	graphics = 0
-
-	// If configured and cold, maek ice
-	if(zas_settings.Get(/datum/ZAS_Setting/ice_formation))
-		if(temperature <= TEMPERATURE_ICE_FORMATION && return_pressure()>MIN_PRESSURE_ICE_FORMATION)
-			// If we're just forming, do a probability check.  Otherwise, KEEP IT ON~
-			// This ordering will hopefully keep it from sampling random noise every damn tick.
-			//if(was_icy || (!was_icy && prob(25)))
-			graphics |= GRAPHICS_COLD
-=======
 	graphic = 0
 
 	if(temperature <= TEMPERATURE_ICE_FORMATION && return_pressure()>MIN_PRESSURE_ICE_FORMATION)
@@ -222,7 +203,7 @@ What are the archived variables for?
 		// This ordering will hopefully keep it from sampling random noise every damn tick.
 		//if(was_icy || (!was_icy && prob(25)))
 		graphic = 3
->>>>>>> parent of 0227baa... Reverting ZAS back to /vg/ style
+
 
 	if(toxins > MOLES_PLASMA_VISIBLE)
 		graphic = 1
diff --git a/code/ZAS/ZAS_Turfs.dm b/code/ZAS/ZAS_Turfs.dm
index 583a85f79f6..5a712adb9ed 100644
--- a/code/ZAS/ZAS_Turfs.dm
+++ b/code/ZAS/ZAS_Turfs.dm
@@ -47,6 +47,8 @@
 
 /turf/simulated/var/tmp/obj/fire/active_hotspot
 
+/turf/simulated/var/tmp/was_icy = 0
+
 /turf/simulated/proc/update_visuals()
 	overlays = null
 
@@ -54,46 +56,6 @@
 	if(siding_icon_state)
 		overlays += image('icons/turf/floors.dmi',siding_icon_state)
 	var/datum/gas_mixture/model = return_air()
-<<<<<<< HEAD
-	if(model.graphics & GRAPHICS_COLD)
-		if(!was_icy)
-			wet=3 // Custom ice
-			was_icy=1
-			var/o=""
-			//if(is_plating())
-			//	o="snowfloor_s"
-			//else
-			if(is_plasteel_floor())
-				o="snowfloor"
-			if(o!="")
-				overlays += image('icons/turf/overlays.dmi',o)
-	else
-		if(was_icy)
-			wet=0
-			was_icy=0
-			if(prob(10))
-				wet = 1
-				if(wet_overlay)
-					overlays -= wet_overlay
-					wet_overlay = null
-				wet_overlay = image('icons/effects/water.dmi',src,"wet_floor")
-				overlays += wet_overlay
-
-				spawn(800)
-					if (!istype(src)) return
-					if(wet >= 2) return
-					wet = 0
-					if(wet_overlay)
-						overlays -= wet_overlay
-						wet_overlay = null
-	if(model.graphics & GRAPHICS_PLASMA)
-		overlays.Add(plmaster)
-	if(model.graphics & GRAPHICS_N2O)
-		overlays.Add(slmaster)
-	//if(model.graphics & GRAPHICS_REAGENTS)
-	//	overlays.Add(slmaster/*rlmaster*/)
-=======
-
 
 
 	switch(model.graphic)
@@ -132,7 +94,6 @@
 						if(wet_overlay)
 							overlays -= wet_overlay
 							wet_overlay = null
->>>>>>> parent of 0227baa... Reverting ZAS back to /vg/ style
 
 
 /turf/simulated/New()
diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm
index 25dd0c6bd5f..8b84e530ebf 100644
--- a/code/ZAS/ZAS_Zones.dm
+++ b/code/ZAS/ZAS_Zones.dm
@@ -252,17 +252,6 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 
 	air.graphic = 0
 	if(air.toxins > MOLES_PLASMA_VISIBLE)
-<<<<<<< HEAD
-		air.graphics |= GRAPHICS_PLASMA
-	if(air.trace_gases.len)
-		var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in air.trace_gases
-		if(sleeping_agent && (sleeping_agent.moles > 1))
-			air.graphics |= GRAPHICS_N2O
-	// If configured and cold, maek ice
-	if(zas_settings.Get(/datum/ZAS_Setting/ice_formation))
-		if(air.temperature <= TEMPERATURE_ICE_FORMATION && air.return_pressure()>MIN_PRESSURE_ICE_FORMATION)
-			air.graphics |= GRAPHICS_COLD
-=======
 		air.graphic = 1
 	if(air.trace_gases.len)
 		var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in air.trace_gases
@@ -270,7 +259,6 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 			air.graphic = 2
 	if(air.temperature <= TEMPERATURE_ICE_FORMATION && air.return_pressure()>MIN_PRESSURE_ICE_FORMATION)
 		air.graphic = 3
->>>>>>> parent of 0227baa... Reverting ZAS back to /vg/ style
 
 	progress = "problem with an inbuilt byond function: some conditional checks"
 
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 8d5ca0630fe..2a3da63ef72 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -130,12 +130,8 @@ datum/controller/game_controller/proc/process()
 					last_thing_processed = air_master.type
 
 					air_master.current_cycle++
-<<<<<<< HEAD
-					if(!air_master.tick()) //Runtimed.
-=======
 //					if(!air_master.tick()) Runtimed.
 					if(!air_master.Tick())
->>>>>>> parent of 0227baa... Reverting ZAS back to /vg/ style
 						air_master.failed_ticks++
 						if(air_master.failed_ticks > 5)
 							world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER.  Killing air simulation!</font></b>"