diff --git a/src/main/resources/assets/lostcities/citydata/palette.json b/src/main/resources/assets/lostcities/citydata/palette.json
index 6d84e58b7..c82e74dca 100644
--- a/src/main/resources/assets/lostcities/citydata/palette.json
+++ b/src/main/resources/assets/lostcities/citydata/palette.json
@@ -245,22 +245,7 @@
       {
         "char": "@",
         "block": "minecraft:double_stone_slab",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        "damaged": "minecraft:iron_bars"
->>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
-=======
-        "damaged": "minecraft:iron_bars"
->>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
-=======
-        "damaged": "minecraft:iron_bars"
->>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
-=======
-        "damaged": "minecraft:iron_bars"
->>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
+        "damaged": "minecraft:stone_slab"
       }
     ]
   },
@@ -602,4 +587,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]