Update nexus: fix conflicts and sync local changes

wiki/entities/Martin-Nash.md

@@ -1,39 +1,39 @@
----
-title: "Martin Nash"
-type: entity
-tags: [Person, Technical Architecture, Cloud Transformation]
-sources: [ctp-topic-23-introduction-to-the-technical-architecture-team-and-function]
-last_updated: 2026-04-14
----
-
-# Martin Nash
-
-## Role
-**Technical Architecture Manager**（技术架构经理）
-
-## Organization
-[[Cloud Transformation Office]] — 云转型办公室
-
-## Responsibilities
-- 领导技术架构团队
-- 维护 AWS Enterprise Landing Zones
-- 制定技术路线图（12-24个月）
-- 推动云优先策略落地
-
-## Key Contributions
-- 主讲 CTP Topic 23：技术架构团队职能介绍
-- 推动 PSTC 与 IT 部门整合至 CIO 统一领导
-- 倡导从被动响应转向主动规划
-
-## Related People
-- [[Brendan Starnig]] — SRE Function Lead
-- [[Heather Norris]] — CTP Topic 4 主讲人
-
-## Related Concepts
-- [[Technical Architecture Team]]
-- [[Enterprise Architecture (EA)]]
-- [[Solution Architecture (SA)]]
-- [[Technical Architecture (TA)]]
-
-## Sources
-- [[ctp-topic-23-introduction-to-the-technical-architecture-team-and-function]]
+---
+title: "Martin Nash"
+type: entity
+tags: [Person, Technical Architecture, Cloud Transformation]
+sources: [ctp-topic-23-introduction-to-the-technical-architecture-team-and-function]
+last_updated: 2026-04-14
+---
+
+# Martin Nash
+
+## Role
+**Technical Architecture Manager**（技术架构经理）
+
+## Organization
+[[Cloud Transformation Office]] — 云转型办公室
+
+## Responsibilities
+- 领导技术架构团队
+- 维护 AWS Enterprise Landing Zones
+- 制定技术路线图（12-24个月）
+- 推动云优先策略落地
+
+## Key Contributions
+- 主讲 CTP Topic 23：技术架构团队职能介绍
+- 推动 PSTC 与 IT 部门整合至 CIO 统一领导
+- 倡导从被动响应转向主动规划
+
+## Related People
+- [[Brendan Starnig]] — SRE Function Lead
+- [[Heather Norris]] — CTP Topic 4 主讲人
+
+## Related Concepts
+- [[Technical Architecture Team]]
+- [[Enterprise Architecture (EA)]]
+- [[Solution Architecture (SA)]]
+- [[Technical Architecture (TA)]]
+
+## Sources
+- [[ctp-topic-23-introduction-to-the-technical-architecture-team-and-function]]