diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
index 4aabc88d2d..d99b5042b2 100644
--- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
@@ -8,12 +8,20 @@
 	name = "stack of sifgrass"
 	type_to_spawn = /obj/item/stack/tile/grass/sif
 
+<<<<<<< HEAD
 //CHOMPedit, delete if this is added upstream.
 /obj/fiftyspawner/grass/sif/forest
 	name = "stack of sifgrass"
 	type_to_spawn = /obj/item/stack/tile/grass/sif/forest
 //CHOMPedit end
 
+||||||| parent of 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
+=======
+/obj/fiftyspawner/grass/sif/forest
+	name = "stack of sifgrass"
+	type_to_spawn = /obj/item/stack/tile/grass/sif/forest
+
+>>>>>>> 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
 /obj/fiftyspawner/wood
 	name = "stack of wood"
 	type_to_spawn = /obj/item/stack/tile/wood
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index befe769b91..913fcbab78 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -52,12 +52,21 @@
 	singular_name = "sivian grass floor tile"
 	desc = "A patch of grass like those that decorate the plains of Sif."
 
+<<<<<<< HEAD
 //CHOMPedit: remove if this gets added upstream
 /obj/item/stack/tile/grass/sif/forest
 	name = "sivian overgrowth tile"
 	singular_name = "sivian overgrowth floor tile"
 	desc = "A patch of dark overgrowth like those that decorate the plains of Sif."
 //CHOMPedit end
+||||||| parent of 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
+=======
+/obj/item/stack/tile/grass/sif/forest
+	name = "sivian overgrowth tile"
+	singular_name = "sivian overgrowth floor tile"
+	desc = "A patch of dark overgrowth like those that decorate the plains of Sif."
+
+>>>>>>> 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
 /*
  * Wood
  */
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 42e3792bb0..3fa9e921cb 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -148,6 +148,15 @@ var/list/flooring_types
 	icon_base = "grass_sif"
 	build_type = /obj/item/stack/tile/grass/sif
 	has_base_range = 1
+	
+/decl/flooring/grass/sif/forest
+	name = "thick growth"
+	desc = "A natural moss that has adapted to the sheer cold climate."
+	flags = TURF_REMOVE_SHOVEL
+	icon = 'icons/turf/outdoors.dmi'
+	icon_base = "grass_sif_dark"
+	build_type = /obj/item/stack/tile/grass/sif/forest
+	has_base_range = 1
 
 //CHOMPedit: sif/forest decl. If this ends up upstream just accept the upstream version.
 /decl/flooring/grass/sif/forest
diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm
index ac8a9c43b7..c71a4c7659 100644
--- a/code/game/turfs/simulated/outdoors/grass.dm
+++ b/code/game/turfs/simulated/outdoors/grass.dm
@@ -89,7 +89,12 @@ var/list/grass_types = list(
 /turf/simulated/floor/outdoors/grass/sif/forest
 	name = "thick growth"
 	icon_state = "grass_sif_dark0"
+<<<<<<< HEAD
 	initial_flooring = /decl/flooring/grass/sif/forest //CHOMPedit: Remove if this ends up upstream
+||||||| parent of 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
+=======
+	initial_flooring = /decl/flooring/grass/sif/forest
+>>>>>>> 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
 	edge_blending_priority = 5
 	tree_chance = 4
 	grass_chance = 1