powder that makes you say yes

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -141,10 +141,6 @@
 	icon_state = "tile-tealcarpet"
 	no_variants = FALSE
 
-<<<<<<< HEAD
-/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw //CHOMP Comment: Yawn commented out this block, but CHOMP already commented out this stuff so I just removed theirs.
-
-=======
 /obj/item/stack/tile/carpet/geo
 	icon_state = "tile-carpet-deco"
 	desc = "A piece of carpet with a gnarly geometric design. It is the same size as a normal floor tile!"
@@ -157,9 +153,7 @@
 	icon_state = "tile-carpet-retro-red"
 	desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!"
 
-// TODO - Add descriptions to these
-/obj/item/stack/tile/carpet/bcarpet
->>>>>>> 0f7ef0cce1... Merge pull request #12800 from VOREStation/upstream-merge-8556
+/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw //CHOMP Comment: Yawn commented out this block, but CHOMP already commented out this stuff so I just removed theirs.
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet
 	icon_state = "tile-carpet"
@@ -173,14 +167,7 @@
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/oracarpet
 	icon_state = "tile-carpet"
-<<<<<<< HEAD
 	*/
-/obj/item/stack/tile/carpet/deco
-	icon_state = "tile-carpet-deco"
-/obj/item/stack/tile/carpet/retro
-	icon_state = "tile-carpet-retro"
-=======
->>>>>>> 0f7ef0cce1... Merge pull request #12800 from VOREStation/upstream-merge-8556
 
 /obj/item/stack/tile/floor
 	name = "floor tile"