fix conflicts

Author: kmurphypolygon

…nnovation-design/agglayer/agglayer-go.md docs/agglayer/agglayer-go.mddocs/innovation-design/agglayer/agglayer-go.md renamed to docs/agglayer/agglayer-go.md docs/innovation-design/agglayer/agglayer-go.md renamed to docs/agglayer/agglayer-go.md

@@ -10,7 +10,7 @@ The AggLayer Golang architecture supports interactions with multiple CDK chains
 The diagram below shows the full start-up, running, and shutdown sequence for the application and its components.
 
 <center>
-![CDK architecture](../../img/cdk/agglayer/agglayer-go.png)
+![CDK architecture](../img/cdk/agglayer/agglayer-go.png)
 </center>
 
 ## Get started

…nnovation-design/agglayer/agglayer-rs.md docs/agglayer/agglayer-rs.mddocs/innovation-design/agglayer/agglayer-rs.md renamed to docs/agglayer/agglayer-rs.md docs/innovation-design/agglayer/agglayer-rs.md renamed to docs/agglayer/agglayer-rs.md

@@ -5,10 +5,10 @@ The unified bridge is a single bridge contract on Ethereum, providing a safe, co
 
 ## Bridging mechanism
 
-The bridging mechanism enables token transfers and message-passing between Ethereum (L1) and CDK chains via smart contracts. Detailed in the [zkEVM bridging documentation](../../zkEVM/architecture/unified-LxLy/bridging.md), core components include the bridge and exit root Solidity smart contracts.
+The bridging mechanism enables token transfers and message-passing between Ethereum (L1) and CDK chains via smart contracts. Detailed in the [zkEVM bridging documentation](../zkEVM/architecture/unified-LxLy/bridging.md), core components include the bridge and exit root Solidity smart contracts.
 
 ## Data structures 
 
 Each chain holds a single data structure which stores a record of all token withdrawals and messages that originated from that chain. This “exit tree” is an append-only Merkle trie, similar in structure to the Ethereum deposit trie. The latest state of each chain and the unified bridge is represented by the root of this Merkle tree, referred to as the “exit root.”
 
-As cryptographic commitments, exit roots ensure the integrity of the network as a whole.  Refer to the [exit root documentation](../../zkEVM/architecture/high-level/smart-contracts/exit-roots.md) for greater detail about the role of exit roots in the system.
+As cryptographic commitments, exit roots ensure the integrity of the network as a whole.  Refer to the [exit root documentation](../zkEVM/architecture/high-level/smart-contracts/exit-roots.md) for greater detail about the role of exit roots in the system.

…s/innovation-design/agglayer/overview.md docs/agglayer/overview.mddocs/innovation-design/agglayer/overview.md renamed to docs/agglayer/overview.md docs/innovation-design/agglayer/overview.md renamed to docs/agglayer/overview.md

@@ -10,15 +10,15 @@ The LxLy bridge contracts carry out deposit and withdrawal of assets between L2
 
 Chains looking to run their own bridge infrastructure can choose to deploy a new instance of the [LxLy bridge](../../zkEVM/architecture/unified-LxLy/index.md) that allows users to move assets (both native and [ERC20](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/) tokens) from L1 to the L2 and vice versa.
 
-Deploying an individual instance of the LxLy means interoperability with other L2 chains via the [AggLayer](../../innovation-design/agglayer/overview.md) is not possible. To enable cross-chain interoperability (i.e. L2-to-L2 cross-chain transactions), chains can opt-in to the AggLayer and use the [unified bridge](../../innovation-design/agglayer/unified-bridge.md).
+Deploying an individual instance of the LxLy means interoperability with other L2 chains via the [AggLayer](../../agglayer/overview.md) is not possible. To enable cross-chain interoperability (i.e. L2-to-L2 cross-chain transactions), chains can opt-in to the AggLayer and use the [unified bridge](../../agglayer/unified-bridge.md).
 
 This option is suited to chains that may want to customize how the bridge is managed and operated, or maintain control of the bridge's funds; as the [upgradeability](./admin-upgradeability.md) of the bridge contracts are managed by the chain operator.
 
 ![LxLy bridge](../../img/cdk/lxly.png)
 
 ## Unified bridge
 
-A single, shared instance of the LxLy bridge, called the [unified bridge](../../innovation-design/agglayer/unified-bridge.md) is available to use for all CDK chains that opt-in to the AggLayer. 
+A single, shared instance of the LxLy bridge, called the [unified bridge](../../agglayer/unified-bridge.md) is available to use for all CDK chains that opt-in to the AggLayer. 
 
 It is a shared smart contract deployed on Ethereum, responsible for enabling interoperability between chains in the form of cross-chain transactions and L2-to-L2 transfers.
 
@@ -32,4 +32,4 @@ This option is suited to chains that want a standard bridging experience and do
 
 - [Aggregated blockchains: A new thesis](https://polygon.technology/blog/aggregated-blockchains-a-new-thesis).
 - [LxLy bridge](../../zkEVM/architecture/unified-LxLy/index.md).
-- [Unified bridge overview](../../innovation-design/agglayer/unified-bridge.md).
+- [Unified bridge overview](../../agglayer/unified-bridge.md).

…nnovation-design/agglayer/token-flows.md docs/agglayer/token-flows.mddocs/innovation-design/agglayer/token-flows.md renamed to docs/agglayer/token-flows.md docs/innovation-design/agglayer/token-flows.md renamed to docs/agglayer/token-flows.md

@@ -16,7 +16,7 @@ Polygon CDK provides the components necessary to build a layer 2 blockchain that
 
 - Modularity: CDK modular components allow developers to easily customize their L2 environment and build a chain that meets their specific needs.
 
-- Interoperability: Opt-in to the [AggLayer](../innovation-design/agglayer/overview.md) to bootstrap your chain's ecosystem, enable cross-chain transactions expanding your reach and user base, while attracting users and liquidity from other established chains.
+- Interoperability: Opt-in to the [AggLayer](../agglayer/overview.md) to bootstrap your chain's ecosystem, enable cross-chain transactions expanding your reach and user base, while attracting users and liquidity from other established chains.
 
 - Sovereignty: Maintain full control over your chain's revenue, governance, security, economic policies, and more.
 

…vation-design/agglayer/unified-bridge.md docs/agglayer/unified-bridge.mddocs/innovation-design/agglayer/unified-bridge.md renamed to docs/agglayer/unified-bridge.md docs/innovation-design/agglayer/unified-bridge.md renamed to docs/agglayer/unified-bridge.md

@@ -100,7 +100,7 @@ hide:
 							</div>
 							<p class="feature-paragraph">Deep dives only. Further your understanding of Polygon scaling technology.</p></br>
 						</div>
-						<a href="innovation-design/agglayer/overview" class="flex-card-item w-inline-block">
+						<a href="agglayer/overview" class="flex-card-item w-inline-block">
 							<div class="product-list-item-header">
 								<div class="feature-card-heading">AggLayer</div>
 								<div class="arrow-embed w-embed"><svg xmlns="http://www.w3.org/2000/svg" display="block" width="100%" height="auto" viewbox="0 0 16 17" fill="none">

docs/cdk/agglayer/overview.md

@@ -36,6 +36,6 @@ The role of these nodes is crucial as they act as a bridge between the Ethereum
 
 ## Upcoming developments
 
-Originally launched as Matic Network in June 2020, Polygon PoS has undergone numerous upgrades since its inception. Initially designed to scale Ethereum through a sidechain, a new proposal on the Polygon forum suggests upgrading Polygon PoS into a zero-knowledge (ZK)-based validium on Ethereum. Polygon PoS will soon adopt the execution environment of Polygon zkEVM along with a dedicated data availability layer. This new architecture would be inherently interoperable with a broader network of ZK-powered Ethereum L2s via the [AggLayer](../innovation-design/agglayer/overview.md).
+Originally launched as Matic Network in June 2020, Polygon PoS has undergone numerous upgrades since its inception. Initially designed to scale Ethereum through a sidechain, a new proposal on the Polygon forum suggests upgrading Polygon PoS into a zero-knowledge (ZK)-based validium on Ethereum. Polygon PoS will soon adopt the execution environment of Polygon zkEVM along with a dedicated data availability layer. This new architecture would be inherently interoperable with a broader network of ZK-powered Ethereum L2s via the [AggLayer](../agglayer/overview.md).
 
 Polygon PoS will continue to be the foundational infrastructure for a wide array of decentralized applications and services. More details about the overarching vision of a unified ecosystem of L2s on Ethereum can be found in [the innovation & design space](../innovation-design/index.md).