solving conflicts

docs/docs/aztec/concepts/index.md

@@ -29,7 +29,7 @@ Private state works with UTXOs, or what we call notes. To keep things private, e
 
 Public state works similarly to other chains like Ethereum, behaving like a public ledger. Public data is stored in a [public data tree](/aztec/concepts/storage/trees/index.md#public-state-tree).
 
-Aztec [smart contract](/aztec/aztec/concepts/smart_contracts/index.md) developers should keep in mind that different types are used when manipulating private or public state. Working with private state is creating commitments and nullifiers to state, whereas working with public state is directly updating state.
+Aztec [smart contract](/aztec/concepts/smart_contracts/index.md) developers should keep in mind that different types are used when manipulating private or public state. Working with private state is creating commitments and nullifiers to state, whereas working with public state is directly updating state.
 
 ## Accounts
 
@@ -70,14 +70,4 @@ Explore the Concepts for a deeper understanding into the components that make up
 
 ### Start coding
 
-<<<<<<< HEAD
-<<<<<<< HEAD:docs/docs/aztec/aztec/concepts/index.md
-Follow the [developer getting started guide](/getting_started/getting_started).
-=======
 Follow the [developer getting started guide](/getting_started).
-
->>>>>>> fd81464071 (removing nested folders):docs/docs/aztec/concepts/index.md
-=======
-Follow the [developer getting started guide](/getting_started).
-
->>>>>>> 02be02cbcb (fixing conflicts)

docs/docs/aztec/concepts/smart_contracts/functions/context.md

@@ -126,11 +126,7 @@ The public call stack contains all of the external function calls that are creat
 
 ### New L2 to L1 msgs
 
-<<<<<<< HEAD:docs/docs/aztec/aztec/concepts/smart_contracts/functions/context.md
 New L2 to L1 messages contains messages that are delivered to the [l1 outbox](/protocol-specs/l1-smart-contracts/index.md) on the execution of each rollup.
-=======
-New L2 to L1 messages contains messages that are delivered to the [l1 outbox](/aztec/concepts/smart_contracts/communication/cross_chain_calls) on the execution of each rollup.
->>>>>>> fd81464071 (removing nested folders):docs/docs/aztec/concepts/smart_contracts/functions/context.md
 
 ## Public Context
 

docs/docs/aztec/core_components.md

@@ -39,11 +39,7 @@ A user of the Aztec network will interact with the network through Aztec.js. Azt
 
 ### Private Execution Environment
 
-<<<<<<< HEAD:docs/docs/aztec/aztec/core_components.md
-The PXE provides a secure environment for the execution of sensitive operations, ensuring private information and decrypted data are not accessible to unauthorized applications. It hides the details of the [state model](/aztec/aztec/concepts/state_model/index.md) from end users, but the state model is important for Aztec developers to understand as it has implications for [private/public execution](/aztec/aztec/concepts/smart_contracts/communication/public_private_calls.md) and [L1/L2 communication](../../protocol-specs/l1-smart-contracts/index.md). The PXE also includes the [ACIR Simulator](/aztec/aztec/concepts/pxe/acir_simulator.md) for private executions and the KeyStore for secure key management.
-=======
 The PXE provides a secure environment for the execution of sensitive operations, ensuring private information and decrypted data are not accessible to unauthorized applications. It hides the details of the [state model](/aztec/concepts/state_model/index.md) from end users, but the state model is important for Aztec developers to understand as it has implications for [private/public execution](/aztec/concepts/smart_contracts/communication/public_private_calls.md) and [L1/L2 communication](/aztec/concepts/smart_contracts/communication/cross_chain_calls). The PXE also includes the [ACIR Simulator](/aztec/concepts/pxe/acir_simulator.md) for private executions and the KeyStore for secure key management.
->>>>>>> fd81464071 (removing nested folders):docs/docs/aztec/core_components.md
 
 Procedurally, the PXE sends results of private function execution and requests for public function executions to the [sequencer](/aztec/concepts/nodes_clients/sequencer), which will update the state of the rollup.
 

docs/docs/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md

@@ -2,11 +2,7 @@
 title: Communicating with L1
 ---
 
-<<<<<<< HEAD:docs/docs/guides/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md
-Is this your first time hearing the word `Portal`? Check out the [concepts section](../../../../../protocol-specs/l1-smart-contracts/index.md).
-=======
 Is this your first time hearing the word `Portal`? Check out the [concepts section](/aztec/concepts/smart_contracts/communication/cross_chain_calls).
->>>>>>> fd81464071 (removing nested folders):docs/docs/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md
 
 Follow the [token bridge tutorial](/tutorials/contract_tutorials/advanced/token_bridge) for hands-on experience writing and deploying a Portal contract.
 

docs/docs/reference/sandbox_reference/sandbox-reference.md

@@ -62,11 +62,7 @@ In the terminal, you will see some logs:
 
 ## Manual Install
 
-You can manually install the sandbox via the underlying script used in the [Aztec Boxes](/getting_started.md#run-the-npx-script).
->>>>>>> fd81464071 (removing nested folders):docs/docs/reference/sandbox_reference/sandbox-reference.md
-=======
 You can manually install the sandbox via the underlying script used in the [Aztec Boxes](getting_started.md#run-the-npx-script).
->>>>>>> 02be02cbcb (fixing conflicts)
 
 ### Prerequisites