diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index a1785aa3b6b..68f46681a0a 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -157,7 +157,11 @@
 	if(co != null) carbon_amt = co
 	..()
 
+<<<<<<< HEAD
 /obj/effect/spawner/newbomb/Initialize(newloc) //VOREStation Edit
+=======
+/obj/effect/spawner/newbomb/Initialize(newloc)
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	..(newloc)
 
 	var/obj/item/device/transfer_valve/V = new(src.loc)
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 2ac86acc735..84caf7e595b 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -83,7 +83,11 @@
 	icon_state = "jetpack-void"
 	item_state_slots = list(slot_r_hand_str = "jetpack-void", slot_l_hand_str = "jetpack-void")
 
+<<<<<<< HEAD
 /obj/item/weapon/tank/jetpack/void/Initialize() //VOREStation Edit
+=======
+/obj/item/weapon/tank/jetpack/void/Initialize()
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	..()
 	air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
@@ -94,7 +98,11 @@
 	icon_state = "jetpack"
 	item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack")
 
+<<<<<<< HEAD
 /obj/item/weapon/tank/jetpack/oxygen/Initialize() //VOREStation Edit
+=======
+/obj/item/weapon/tank/jetpack/oxygen/Initialize()
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	..()
 	air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
@@ -106,7 +114,11 @@
 	icon_state = "jetpack-black"
 	item_state_slots = list(slot_r_hand_str = "jetpack-black", slot_l_hand_str = "jetpack-black")
 
+<<<<<<< HEAD
 /obj/item/weapon/tank/jetpack/carbondioxide/Initialize() //VOREStation Edit
+=======
+/obj/item/weapon/tank/jetpack/carbondioxide/Initialize()
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	..()
 	air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
index 48782c8371d..7ceb83081bd 100644
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -189,7 +189,11 @@
 	item_state = "coffee"
 	center_of_mass = list("x"=15, "y"=13)
 
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/drinks/h_chocolate/Initialize() //VOREStation Edit
+=======
+/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/Initialize()
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	..()
 	reagents.add_reagent("hot_coco", 30)
 
@@ -198,7 +202,11 @@
 	desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
 	icon_state = "ramen"
 	center_of_mass = list("x"=16, "y"=11)
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/drinks/dry_ramen/Initialize() //VOREStation Edit
+=======
+/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/Initialize()
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	..()
 	reagents.add_reagent("dry_ramen", 30)
 
diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
index 2820490daa7..1791a6c1b42 100644
--- a/code/modules/mob/living/carbon/human/human_species.dm
+++ b/code/modules/mob/living/carbon/human/human_species.dm
@@ -36,7 +36,11 @@
 /mob/living/carbon/human/promethean/Initialize(var/new_loc)
 	return ..(new_loc, SPECIES_PROMETHEAN)
 
+<<<<<<< HEAD
 /mob/living/carbon/human/zaddat/Initialize(var/new_loc) //VOREStation Edit - Fixes a Polaris bug
+=======
+/mob/living/carbon/human/zaddat/Initialize(var/new_loc)
+>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
 	return ..(new_loc, SPECIES_ZADDAT)
 
 /mob/living/carbon/human/monkey/Initialize(var/new_loc)