diff --git a/code/ZAS/FEA_gas_mixture.dm b/code/ZAS/FEA_gas_mixture.dm
index d3b163256fb..c405a5c812f 100644
--- a/code/ZAS/FEA_gas_mixture.dm
+++ b/code/ZAS/FEA_gas_mixture.dm
@@ -17,15 +17,12 @@ 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 e4a82df... ZAS switched from /vg/ to BS12
 /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
@@ -201,15 +198,7 @@ What are the archived variables for?
 	//Inputs: None
 	//Outputs: 1 if graphic changed, 0 if unchanged
 
-<<<<<<< HEAD
-	graphic = 0
 
-	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)))
-		graphic = 3
-=======
 	graphics = 0
 
 	// If configured and cold, maek ice
@@ -219,7 +208,6 @@ 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)))
 			graphics |= GRAPHICS_COLD
->>>>>>> parent of e4a82df... ZAS switched from /vg/ to BS12
 
 	if(toxins > MOLES_PLASMA_VISIBLE)
 		graphics |= GRAPHICS_PLASMA
diff --git a/code/ZAS/ZAS_Turfs.dm b/code/ZAS/ZAS_Turfs.dm
index 78083ee4630..e7f5f4402f8 100644
--- a/code/ZAS/ZAS_Turfs.dm
+++ b/code/ZAS/ZAS_Turfs.dm
@@ -51,8 +51,6 @@
 /turf/simulated/var/tmp/obj/fire/active_hotspot
 /turf/simulated/var/tmp/was_icy=0
 
-/turf/simulated/var/tmp/was_icy=0
-
 /turf/simulated/proc/update_visuals()
 	overlays = null
 
@@ -62,47 +60,6 @@
 
 	// ONLY USED IF ZAS_SETTINGS SAYS SO.
 	var/datum/gas_mixture/model = return_air()
-<<<<<<< HEAD
-
-
-
-	switch(model.graphic)
-		if(1)
-			overlays.Add(plmaster) //TODO: Make invisible plasma an option
-		if(2)
-			overlays.Add(slmaster)
-		if(3)
-			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_COLD)
 		if(!was_icy)
 			wet=3 // Custom ice
@@ -140,7 +97,6 @@
 		overlays.Add(slmaster)
 	//if(model.graphics & GRAPHICS_REAGENTS)
 	//	overlays.Add(slmaster/*rlmaster*/)
->>>>>>> parent of e4a82df... ZAS switched from /vg/ to BS12
 
 
 /turf/simulated/New()
diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm
index cf914c7af34..c538a6c7c2a 100644
--- a/code/ZAS/ZAS_Zones.dm
+++ b/code/ZAS/ZAS_Zones.dm
@@ -180,15 +180,6 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 
 	air.graphics = 0
 	if(air.toxins > MOLES_PLASMA_VISIBLE)
-<<<<<<< HEAD
-		air.graphic = 1
-	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.graphic = 2
-	if(air.temperature <= TEMPERATURE_ICE_FORMATION && air.return_pressure()>MIN_PRESSURE_ICE_FORMATION)
-		air.graphic = 3
-=======
 		air.graphics |= GRAPHICS_PLASMA
 	if(air.trace_gases.len)
 		var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in air.trace_gases
@@ -198,7 +189,6 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 	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
->>>>>>> parent of e4a82df... ZAS switched from /vg/ to BS12
 
 	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 ecee891060b..78baecdd28a 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -129,12 +129,7 @@ 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())
-=======
 					if(!air_master.tick()) //Runtimed.
->>>>>>> parent of e4a82df... ZAS switched from /vg/ to BS12
 						air_master.failed_ticks++
 						if(air_master.failed_ticks > 5)
 							world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER.  Killing air simulation!</font></b>"