diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml
index 9c87244067..38c6479c19 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml
@@ -90,7 +90,6 @@
   - type: CP14MagicEnergyDraw
     energy: -1
     delay: 3 # 5m to full restore
-  - type: CP14MagicUnsafeDamage
   - type: CP14MagicEnergyExaminable
 
 - type: entity
diff --git a/Resources/Prototypes/_CP14/Maps/comoss.yml b/Resources/Prototypes/_CP14/Maps/comoss.yml
index ca180cc0a7..cba7f61de1 100644
--- a/Resources/Prototypes/_CP14/Maps/comoss.yml
+++ b/Resources/Prototypes/_CP14/Maps/comoss.yml
@@ -21,7 +21,7 @@
             CP14Alchemist: [ 2, 2 ]
             CP14Blacksmith: [ 2, 2 ]
             CP14Innkeeper: [ 3, 4 ]
-            #CP14Merchant: [2, 2]
+            CP14Merchant: [2, 2]
             #Guard
             CP14Guard: [8, 8]
             CP14GuardCommander: [1, 1]