diff --git a/code/controllers/subsystems/assets.dm b/code/controllers/subsystems/assets.dm
index 2041104a2b..0da1173cd0 100644
--- a/code/controllers/subsystems/assets.dm
+++ b/code/controllers/subsystems/assets.dm
@@ -6,11 +6,23 @@ SUBSYSTEM_DEF(assets)
 	var/list/preload = list()
 
 /datum/controller/subsystem/assets/Initialize(timeofday)
+<<<<<<< HEAD
 	for(var/type in typesof(/datum/asset))
 		var/datum/asset/A = type
 		if (type != initial(A._abstract))
 			get_asset_datum(type)
 
+||||||| parent of 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
+	for(var/datum/asset/A as anything in typesof(/datum/asset))
+		if (type != initial(A._abstract))
+			get_asset_datum(type)
+
+=======
+	for(var/typepath in typesof(/datum/asset))
+		var/datum/asset/A = typepath
+		if (typepath != initial(A._abstract))
+			get_asset_datum(typepath)
+>>>>>>> 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
 
 	preload = cache.Copy() //don't preload assets generated during the round
 
diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index bb9ef2a255..ce1eddfbf2 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -43,10 +43,20 @@
 
 	if(!available_recipes)
 		available_recipes = new
+<<<<<<< HEAD
 		for(var/T in (typesof(/datum/recipe)-/datum/recipe))
 			var/datum/recipe/type = T
 			if((initial(type.appliance) & appliancetype))
 				available_recipes += new type
+||||||| parent of 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
+		for(var/datum/recipe/type as anything in subtypesof(/datum/recipe))
+			if((initial(type.appliance) & appliancetype))
+				available_recipes += new type
+=======
+		for(var/datum/recipe/typepath as anything in subtypesof(/datum/recipe))
+			if((initial(typepath.appliance) & appliancetype))
+				available_recipes += new typepath
+>>>>>>> 70cccc775a... Merge pull request #11192 from VOREStation/Arokha/hmm
 		
 		acceptable_items = new
 		acceptable_reagents = new