diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 5ad61c6689..096e88bcb6 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -135,7 +135,7 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2
+    fx: EffectRCDDeconstruct2  
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
diff --git a/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
index 4fa7d8e4a5..ab33c9f18d 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
@@ -1,15 +1,23 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
+<<<<<<<< HEAD:Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
   "copyright": "Created by TheShuEd (Github) for CrystallPunk 14",
+========
+  "copyright": "Made by SlamBamActionman",
+>>>>>>>> space-station-14/master:Resources/Textures/Objects/Misc/cd.rsi/meta.json
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
+<<<<<<<< HEAD:Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
       "name": "wooden",
       "directions": 4
+========
+      "name": "icon"
+>>>>>>>> space-station-14/master:Resources/Textures/Objects/Misc/cd.rsi/meta.json
     }
   ]
 }