diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index be03ad872d..cabc1429f8 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -114,11 +114,7 @@
 	build_type = /obj/item/stack/tile/wood
 
 
-<<<<<<< HEAD
 //CHOMPEDIT: Moving carpets to tile_types_ch to give them proper names, descriptions and material variables
-=======
-
->>>>>>> 0f7ef0cce1... Merge pull request #12800 from VOREStation/upstream-merge-8556
 /*
 /obj/item/stack/tile/carpet
 	name = "carpet"