chore: resolve conflicts

content/00.zksync-era/10.guides/20.zksync-101/30.testing.md

@@ -22,7 +22,7 @@ You will have downloaded the 101 project through ZKsync CLI `create`.
 Since we are using `hardhat-zksync` for testing, you do not need to have the
 in memory anvil-zksync node running for this section.
 
-If your local in-memory anvil-zksync node is running, stop it with the following command:
+If your local `anvil-zksync` node is running, stop it with the following command:
 
 ```bash
 zksync-cli dev stop

content/00.zksync-era/10.guides/20.zksync-101/40.upgrading.md

@@ -18,7 +18,7 @@ lead you through the strategies and practices for making the `CrowdfundingCampai
 Make sure to go through the setup provided in the initial [Getting started](/build/start-coding/zksync-101) section.
 You will have downloaded the 101 project through ZKsync CLI `create` and started up a local anvil-zksync node for development.
 
-If you haven't started up your local in-memory anvil-zksync node or you're not sure, run the following:
+If you haven't started up your local `anvil-zksync` node or you're not sure, run the following:
 
 ```bash
 zksync-cli dev restart

content/00.zksync-era/40.tooling/10.local-setup/10.anvil-zksync-node.md

@@ -1,6 +1,6 @@
 ---
 title: anvil-zksync
-description: Learn how to setup a local in-memory anvil-zksync.
+description: Learn how to setup a local anvil-zksync node.
 ---
 
 This section provides instructions on setting up and using the In-Memory Node, `anvil-zksync`, for local testing.
@@ -276,7 +276,7 @@ Here's an example of what you should expect to see when `show-calls` and `resolv
 
 You can send network calls against a running `anvil-zksync`.
 
-Launch the local in-memory anvil-zksync node:
+Launch the local `anvil-zksync` node:
 
   ```bash
   anvil-zksync fork sepolia-testnet

content/00.zksync-era/40.tooling/20.hardhat/20.guides/20.migrating-to-zksync.md

@@ -195,7 +195,7 @@ ZKSync provides different EraVM node implementations to test smart contracts loc
 Unless your project contains L1-L2 features, testing with the anvil-zksync is recommended, which is included in the `@matterlabs/hardhat-zksync` plugin.
 
 ::callout{icon="i-heroicons-exclamation-triangle" color="amber"}
-In version `1.0.12`, `hardhat-network-helpers` introduced support for both in-memory anvil-zksync node and Dockerized setups, allowing methods
+In version `1.0.12`, `hardhat-network-helpers` introduced support for both anvil-zksync node and Dockerized setups, allowing methods
 such as `loadFixture` to be utilized in test files.
 ::
 

content/00.zksync-era/40.tooling/20.hardhat/30.plugins/120.hardhat-zksync-node.md

@@ -74,7 +74,7 @@ npm run hardhat node-zksync
 
 ::
 
-This command runs a local in-memory anvil-zksync node by initiating a JSON-RPC server.
+This command runs a local `anvil-zksync` node by initiating a JSON-RPC server.
 It uses the provided or default configurations to set up and run the ZKsync node, allowing for blockchain operations in a local environment.
 The command also handles tasks such as downloading the necessary JSON-RPC server binary if it's not already present.
 
@@ -107,14 +107,14 @@ Additionally, if either `--replay-tx` or `--fork-block-number` is specified, the
 
 ::callout{icon="i-heroicons-information-circle" color="blue"}
 **Node task override**:
-If the network `zksync` flag is set to `true`, the `hardhat node` command will launch the in-memory anvil-zksync node on port `8545`.
+If the network `zksync` flag is set to `true`, the `hardhat node` command will launch the `anvil-zksync` node on port `8545`.
 ::
 
 ::callout{icon="i-heroicons-information-circle" color="blue"}
 **Overrides for Deploy and Run tasks**:
 If the Hardhat network is selected and the `zksync` flag is set to true,
 the plugin will override the `hardhat run` command and all deployment tasks from the `hardhat-zksync-deploy` plugin,
-launching the in-memory anvil-zksync node before executing the scripts.
+launching the `anvil-zksync` node before executing the scripts.
 
 **Note**:
 To achieve this for deployment scripts,
@@ -137,7 +137,7 @@ To see a list of all supported APIs, visit [this link](%%zk_git_repo_era-test-no
 
 The `hardhat-zksync-node` plugin enhances Hardhat's test task, allowing all tests to run against anvil-zksync node operated in a separate process.
 By invoking the test task, ensure you are using the `hardhat` network and have set its `zksync` flag to `true`.
-Doing so will initiate the plugin's in-memory anvil-zksync node alongside the tests. After the tests conclude, the node shuts down gracefully.
+Doing so will initiate the plugin's `anvil-zksync` node alongside the tests. After the tests conclude, the node shuts down gracefully.
 The plugin begins port allocation from the default 8011.
 
 ```ts

content/00.zksync-era/40.tooling/20.hardhat/30.plugins/130.other-plugins.md

@@ -78,7 +78,7 @@ To prevent this, please include the `--no-compile` flag: `yarn hardhat verify --
 
 This plugin adds new methods that interact with the Hardhat network used for testing.
 
-In version `1.0.12`, `hardhat-network-helpers` introduced support for both in-memory anvil-zksync node and Dockerized setups, allowing methods
+In version `1.0.12`, `hardhat-network-helpers` introduced support for both anvil-zksync node and Dockerized setups, allowing methods
 such as `loadFixture` to be utilized in test files.
 
 ::callout{icon="i-heroicons-exclamation-triangle" color="amber"}

content/00.zksync-era/40.tooling/20.hardhat/30.plugins/60.hardhat-zksync-deploy.md

@@ -240,8 +240,8 @@ const config: HardhatUserConfig = {
 - `accounts` represents a list of the private keys or mnemonic object for the account used in the deployment process.
 
 ::callout{icon="i-heroicons-information-circle" color="blue"}
-**Accounts on In-Memory anvil-zksync Node or zksync-cli Local Node**:
-`accounts` object will be automatically populated with rich accounts if used network is In-Memory anvil-zksync Node or zksync-cli Local Node
+**Accounts on anvil-zksync node or zksync-cli Local Node**:
+`accounts` object will be automatically populated with rich accounts if used network is anvil-zksync Node or zksync-cli Local Node
 
 ::
 

content/00.zksync-era/40.tooling/20.hardhat/30.plugins/70.hardhat-zksync-upgradable.md

@@ -785,7 +785,7 @@ const config: HardhatUserConfig = {
 
 - accounts represents a list of the private keys or mnemonic object for the account used in the deployment or in the upgrade process.
 
-  accounts object will automatically be populated with rich accounts if used network is In-Memory anvil-zksync Node or zksync-cli Local Node
+  accounts object will automatically be populated with rich accounts if used network is anvil-zksync node or zksync-cli Local Node
   To establish a default index per network, which is by default `0`, you can include a `deployerAccounts` section in your `hardhat.config.ts` file.
 
 ```typescript

examples/hardhat-sol-template/deploy/utils.ts

@@ -129,7 +129,7 @@ export const deployContract = async (
 
 /**
  * Rich wallets can be used for testing purposes.
- * Available on in-memory anvil-zksync node and Dockerized node.
+ * Available on anvil-zksync node and Dockerized node.
  */
 export const LOCAL_RICH_WALLETS = [
   {

examples/hardhat-vyper-template/deploy/utils.ts

@@ -97,7 +97,7 @@ export const deployContract = async (
 
 /**
  * Rich wallets can be used for testing purposes.
- * Available on in-memory anvil-zksync node and Dockerized node.
+ * Available on anvil-zksync node and Dockerized node.
  */
 export const LOCAL_RICH_WALLETS = [
   {