diff --git a/GameData/ScrapYard/Config/PartBlacklist.cfg b/GameData/ScrapYard/Config/PartBlacklist.cfg
index cf96863..4540ecc 100644
--- a/GameData/ScrapYard/Config/PartBlacklist.cfg
+++ b/GameData/ScrapYard/Config/PartBlacklist.cfg
@@ -1,31 +1,18 @@
-<<<<<<< Updated upstream
-SY_PART_BLACKLIST
-{
-  name = kerbalEVA
-}
-
-SY_PART_BLACKLIST
-{
-  name = KzFairingBaseShielding
-}
-
-SY_PART_BLACKLIST
-{
-  name = ProceduralFairingBase
-}
-=======
-// PartBlacklist.cfg v1.1.0.0
+// PartBlacklist.cfg v1.1.1.0
 // ScrapYard (SYD)
 // created: 
-// updated: 08 Jan 2023
+// updated: 23 Mar 2023
 
 // this file: GPL-2.0 by zer0Kerbal
 
 SY_PART_BLACKLIST
-{
-	name = kerbalEVA
-	name = Deployed*
-}
+{ name = kerbalEVA }
+
+SY_PART_BLACKLIST
+{ name = KzFairingBaseShielding }
+
+SY_PART_BLACKLIST
+{ name = ProceduralFairingBase }
 
 // SY_PART_BLACKLIST
 // {
@@ -38,4 +25,3 @@ SY_PART_BLACKLIST
 // 	name = DeployedSolarPanel
 // 	name = DeployedWeatherStn
 // }
->>>>>>> Stashed changes
diff --git a/GameData/ScrapYard/Localization/zh-cn.cfg b/GameData/ScrapYard/Localization/zh-cn.cfg
new file mode 100644
index 0000000..8926a78
--- /dev/null
+++ b/GameData/ScrapYard/Localization/zh-cn.cfg
@@ -0,0 +1,79 @@
+// zh-cn.cfg v1.1.0.0
+// ScrapYard (SYD)
+// created: 4 Apr 2023
+// this file: created by tinygrox
+
+
+
+
+
+Localization
+{
+	zh-cn
+	{
+		// Addon specific
+		#SYD-Agency-titl = Kanford and Sons
+		#SYD-Agency-desc = Kanford Kerman 在多年前创立 Kanford 废料回收公司之前，他还是一名废品回收员，一个鳏夫。现在的 Kanford 脾气暴躁、喜欢挖苦别人、混黑、搞手段毫无底线。因为经常想着要搞点快钱，他总是让自己陷入某些危险的境地。
+
+	// ********** Global strings
+		#SYD-settings-SectionName = ScrapYard
+		#SYD-settings-Title = ScrapYard设置
+		#SYD-settings-DisplaySection = ScrapYard (SYD)
+
+	// ********** section 1 strings
+		#SYD-settings-ModEnabled = 启用Mod
+		#SYD-settings-ModEnabled-Tip = 取消选中此选项可在此存档中禁用ScrapYard
+
+		#SYD-settings-UseInventory = 启用库存
+		#SYD-settings-UseInventory-Tip = 取消选中此选项可完全禁用部件库存。
+
+		#SYD-settings-UseTracker = 启用部件追踪
+		#SYD-settings-UseTracker-Tip = 取消选中此选项可完全禁用部件追踪。
+
+		#SYD-settings-OverrideFunds = 覆盖资金 (开发中)
+		#SYD-settings-OverrideFunds-Tip = 启用此功能可以使从库存中提取已回收部件从而降低航天器成本，但回收航天器时需要花费额外资金。\n仍在开发中。
+
+		#SYD-settings-FundsSalePercent = 出售比例
+		#SYD-settings-FundsSalePercent-Tip = 当启用覆盖资金时，设置出售二手部件时获得资金的百分比数值。
+
+		#SYD-settings-DebugLogging = 调试日志
+		#SYD-settings-DebugLogging-Tip = 启用此选项将启用调试日志记录，这将会让ScrapYard在KSP日志中输出额外的信息。
+
+		#SYD-settings-RefreshTime = 编辑界面重新计算频率
+		#SYD-settings-RefreshTime-Tip = 在编辑界面中检查载具的最小的秒数，最后数值需要乘0.1秒后计算。
+
+		#SYD-settings-CPAW = 彩色的部件动作菜单?
+		#SYD-settings-CPAW-Tip = 目前尚未实装。 Project Zelda
+
+	// ModuleSYPartTracker.cs
+		#SYD-GUI-0 = 回收
+		#SYD-GUI-1 = 回收
+		#SYD-GUI-2 = 已<<2>><<1>>次
+		#SYD-GUI-3 = 崭新出厂
+
+	// InstanceSelectorUI.cs
+		#SYD-GUI-4 = <<1>> 在库存
+		#SYD-GUI-5 = 航天器快捷选项 // Whole-Vessel Quick Options 没搞懂这 3 个按钮有啥用，先这样
+		#SYD-GUI-6 = 自动使用 // Automatically Quick Apply
+		#SYD-GUI-7 = 一键使用 // Quick Apply
+		#SYD-GUI-8 = 新部件
+		#SYD-GUI-20 = 使用新部件 
+		#SYD-GUI-21 = 选取新部件
+		
+	// InstanceSelectorVM.cs
+		#SYD-GUI-9 = 没有部件
+		// not currently used
+		#SYD-GUI-10 = ScrapYard_EditorLock
+
+	// PartInstance.cs
+		#SYD-GUI-11 = 丢弃
+		#SYD-GUI-12 = 出售
+		#SYD-GUI-13 = 模块
+		#SYD-GUI-14 = 选取
+		#SYD-GUI-15 = 使用
+		#SYD-GUI-16 = 确定要丢弃此部件吗?
+		#SYD-GUI-17 = 确定要出售此部件来获得 <<1>>的资金?
+		#SYD-GUI-18 = 部件
+		#SYD-GUI-19 = 取消
+	}
+}
\ No newline at end of file
diff --git a/source/ScrapYard/UI/PartInstance.cs b/source/ScrapYard/UI/PartInstance.cs
index f4f68a3..af28409 100644
--- a/source/ScrapYard/UI/PartInstance.cs
+++ b/source/ScrapYard/UI/PartInstance.cs
@@ -82,7 +82,7 @@ private void sellPart()
             MultiOptionDialog diag = new MultiOptionDialog(Localizer.Format("confirmDiscard"),
                 msg,
                 //_sellOrDiscard + " Part",
-                _sellOrDiscard + Localizer.Format(" #SYD-GUI-18"),
+                _sellOrDiscard + Localizer.Format("#SYD-GUI-18"),
                 HighLogic.UISkin,
                 new DialogGUIButton(_sellOrDiscard, () =>
                 {