filip(fix): resolve merge conflicts

docs/06-cardano-testnets/06-tools/01-faucet.mdx

@@ -5,8 +5,8 @@ metaTitle: Testnets faucet
 
 import Faucet from '../../../src/components/Faucet'
 
-Since the Cardano testnet is an independent network, separate from the Cardano
-mainnet, it requires its own tokens.
+Since Cardano testnets are independent networks, separate from the Cardano
+mainnet, they require their own tokens.
 
 The faucet is a web-based service that provides test ada to users of the Cardano
 testnets. While these tokens have no 'real world' value, they enable users to
@@ -16,12 +16,12 @@ the mainnet.
 **To request tokens using the faucet:**
 
 1. Select the desired action type:
-   - Enter the address of the account where you want to top up funds.
+   - Enter the account address where you want to top up funds
    - Enter the pool ID in bech32 format (`pool18ttg8k...a1c`) where you want to
-     delegete funds
+     delegate funds
 2. If you have been issued with an API key, please enter this to access any
-   additional funds you may have been allocated.
-3. Click **Receive test ada**.
+   additional funds you may have been allocated
+3. Click **Receive test ada**
 4. Funds will be in the testnet account you specified within a few minutes.
 
 **Delegation**
@@ -34,7 +34,9 @@ pool delegation' from the action menu.
 <Faucet />
 
 _When you have finished using your test tokens, please return them to the faucet
-so that other members of the community can use them. Please return your test
-tokens to this address:_
+so that other members of the community can use them. You can return your test
+tokens to the relevant address:_
 
-**addr_test1qqr585tvlc7ylnqvz8pyqwauzrdu0mxag3m7q56grgmgu7sxu2hyfhlkwuxupa9d5085eunq2qywy7hvmvej456flknswgndm3**../../../src/components/Faucet/Faucet
+Pre-production faucet address: `addr_test1vzpwq95z3xyum8vqndgdd9mdnmafh3djcxnc6jemlgdmswcve6tkw`
+
+Preview faucet address: `addr_test1vqeux7xwusdju9dvsj8h7mca9aup2k439kfmwy773xxc2hcu7zy99`

docs/08-operating-a-stake-pool/01-stake-pool-operations-101.mdx

@@ -9,23 +9,9 @@ This page helps you navigate through the technical information, resources, and
 updates needed to manage your pool/s operations efficiently, whether you're an
 experienced operator or just starting out.
 
-Last updated on: March 13, 2024
-
-Current node version:
-[v.8.9.0](https://github.com/IntersectMBO/cardano-node/releases/tag/8.9.0)  
-[Release notes](https://docs.cardano.org/tools/release-notes/)  
-[Compatibility matrix](https://docs.cardano.org/tools/comp-matrix/)
-
-Access the
-[cardano-node](https://github.com/input-output-hk/cardano-node#overview-of-the-cardano-node-repository)
-GitHub repository for more information.
-
 ## Latest node details
 
-Cardano node v.8.9.0 introduces
-[Genesis Lite bootstrap peers](https://github.com/input-output-hk/cardano-node-wiki/blob/main/docs/getting-started/understanding-config-files.md#genesis-lite-aka-bootstrap-peers).
-This version also fixes a small bug in the dynamic block forging logic and
-includes some overall improvements.
+You can find the [latest release here.](https://github.com/IntersectMBO/cardano-node/releases)
 
 ## Overview of Cardano environments
 
@@ -61,13 +47,9 @@ Learn more about Cardano environments
 
 Access tools and resources through the links below.
 
-### Tools
-
-[Testnets faucet](https://docs.cardano.org/cardano-testnet/tools/faucet/)  
-[Staking calculator](https://docs.cardano.org/cardano-testnet/tools/staking-calculator/)  
-[Plutus fee estimator](https://docs.cardano.org/cardano-testnet/tools/plutus-fee-estimator/)  
-[Release notes](https://docs.cardano.org/tools/release-notes/)  
-[Compatibility matrix](https://docs.cardano.org/tools/comp-matrix/)  
+[Testnets faucet](https://docs.cardano.org/cardano-testnets/tools/faucet)  
+[Release notes](https://docs.cardano.org/release-notes/release-notes)  
+[Compatibility matrix](https://docs.cardano.org/release-notes/comp-matrix)  
 [Cardano ecosystem tools](https://developers.cardano.org/tools/)  
 [Community-built developer tools](https://www.essentialcardano.io/article/a-list-of-community-built-developer-tools-on-cardano)  
 [Cardano blockchain explorer](https://explorer.cardano.org/en.html)  
@@ -83,14 +65,6 @@ Access tools and resources through the links below.
 [Cardano PoolTool](https://pooltool.io/)  
 [POOLSTATS](https://poolstats.org/#)
 
-### Resources
-
-[Development guidelines](https://docs.cardano.org/development-guidelines/installing-the-cardano-node/)  
-[Operating a stake pool](https://docs.cardano.org/operating-a-stake-pool/creating-a-stake-pool)  
-[The node video course (includes SPO explainers)](https://docs.cardano.org/development-guidelines/cardano-node-course/)
-[Tutorials](https://docs.cardano.org/development-guidelines/transaction-tutorials/introduction/)  
-[Support and feedback](https://docs.cardano.org/cardano-testnet/support-feedback/)
-
 ## SPO alliances
 
 [Guild Operators](https://cardano-community.github.io/guild-operators/): a group

docs/08-operating-a-stake-pool/08-SMASH.mdx

@@ -0,0 +1,18 @@
+---
+title: Pool metadata management
+metaTitle: Pool metadata management
+---
+
+Stake pools are registered on-chain, and their on-chain data (such as information required to calculate rewards) is critical to the operation of the ledger. Stake pools also possess metadata that helps users make a rational choice of a stake pool to delegate to. This metadata is stored off-chain as it might reflect sensitive content, and such an approach allows for a degree of decentralized censorship.
+
+On the other hand, off-chain metadata storage prerequisites a challenge of open access by different users. On-chain stake pool registrations contain a URL pointer to the off-chain metadata and a content hash that can be fetched from a specific stake pool. This might cause both performance and privacy issues. Another crucial aspect to address is the stake pool’s 'ticker' name, which is the short name a stake pool is recognized by. Ticker names might reflect prominent brands or trademarks which should not be duplicated as this leads to confusion. Stake pool operators (SPOs) running multiple pools might want to use the same metadata for all their pools and then, this might also lead to these pools appearing with the same ticker name.
+
+## Use cases
+
+A stake pool metadata aggregation server (SMASH) is introduced to address metadata performance and privacy issues. Delegators, SPOs, exchanges, or wallets can deploy and use SMASH to ensure a higher level of metadata accountability and maintenance. SMASH aggregates metadata from existing stake pools and provides an efficient way to fetch it and store it in a semi-centralized environment. SMASH operators (exchanges, wallets, SPOs) are then enabled to validate and manage this metadata curating it for censorship via the delisting feature.
+
+## Run your own
+
+The first generation of the SMASH server has been deployed by Input Output Global (IOG). It aggregated stake pool metadata and offered a list of valid stake pools with reviewed content and ticker names. Nowadays, various solutions exist to synchronize data from the chain and a SMASH server is provided out-of-the-box as part of the cardano-db-sync project.
+
+For running your own, see [these Cardano DB Sync instructions](https://github.com/IntersectMBO/cardano-db-sync/blob/master/doc/smash.md#smash-characteristics).

docs/15-pioneer-programs/01-plutus-pioneers.mdx

@@ -73,6 +73,6 @@ unlock their individual token.
 
 ## Yes, I'm interested!
 
-**[REGISTER NOW](https://input-output.typeform.com/to/au0XDcBP)**
+**[REGISTER NOW](https://services.iohk.io/plutus-pioneers-registration)**
 
 Please share your details and we will be in touch.

docs/16-release-notes/02-release-notes.mdx

@@ -6,10 +6,8 @@ sidebar_position: 1
 
 Here is the latest release information for the Cardano components. Component
 dependencies and compatibility information can be found in the
-[compatibility matrix](/release-notes/comp-matrix). Release
-notes for Cardano can be found in the
-[Cardano platform > Updates](https://iohk.zendesk.com/hc/en-us/sections/360002160134-Updates)
-section of the IOHK support desk.
+[compatibility matrix](/release-notes/comp-matrix). Release notes for specific
+components are available on each component's release page.
 
 Cardano node configuration details (for mainnet and testnets) are available on
 the
@@ -19,14 +17,10 @@ the
 
 | Name                                                                                | Version                                                                                     | Release date      |
 | ----------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ----------------- |
-| [Cardano node](https://github.com/input-output-hk/cardano-node)                     | [8.9.1](https://github.com/IntersectMBO/cardano-node/releases/tag/8.9.1)                    | 25 March, 2024    |
-| [Cardano RTView](https://github.com/input-output-hk/cardano-rt-view)                | [0.3.0](https://github.com/input-output-hk/cardano-rt-view/releases/tag/0.3.0)              | 15 January, 2021  |
-| [Cardano DB Sync](https://github.com/input-output-hk/cardano-db-sync/releases)      | [13.2.0.1](https://github.com/IntersectMBO/cardano-db-sync/releases/tag/13.2.0.1)           | 15 February, 2023     |
-| [Cardano Rosetta](https://github.com/input-output-hk/cardano-rosetta)               | [2.2.1](https://github.com/cardano-foundation/cardano-rosetta/releases/tag/2.2.1)           | 13 March, 2024  |
-| [Cardano GraphQL](https://github.com/input-output-hk/cardano-graphql)               | [8.0.0](https://github.com/input-output-hk/cardano-graphql/releases/tag/8.0.0)              | 7 February, 2023  |
-| [Cardano Explorer](https://github.com/input-output-hk/cardano-explorer-app)         | [1.6.0](https://github.com/input-output-hk/cardano-explorer-app/releases/tag/1.6.0)         | 27 July, 2021     |
-| [Cardano transactions](https://github.com/input-output-hk/cardano-transactions)     | [1.0.0](https://github.com/input-output-hk/cardano-transactions/releases/tag/1.0.0)         | 21 April, 2020    |
-| [Cardano addresses](https://github.com/input-output-hk/cardano-addresses)           | [3.12.0](https://github.com/input-output-hk/cardano-addresses/releases/tag/3.12.0)          | 17 August, 2022   |
-| [Cardano coin selection](https://github.com/input-output-hk/cardano-coin-selection) | [1.0.1](https://github.com/input-output-hk/cardano-coin-selection/releases/tag/v1.0.1)      | 13 May, 2020      |
-| [Bech32](https://github.com/input-output-hk/bech32)                                 | [1.1.5](https://github.com/IntersectMBO/bech32/releases/tag/v1.1.5)                         | 28 July, 2023     |
-| [Cardano wallet](https://github.com/input-output-hk/cardano-wallet)                 | [v2024-03-27](https://github.com/cardano-foundation/cardano-wallet/releases/tag/v2024-03-27) | 28 March, 2024 |
+| [Cardano node](https://github.com/IntersectMBO/cardano-node)                        | [8.9.2](https://github.com/IntersectMBO/cardano-node/releases/tag/8.9.2)                    | 16 April, 2024    |
+| [Cardano DB Sync](https://github.com/IntersectMBO/cardano-db-sync)                  | [13.2.0.1](https://github.com/IntersectMBO/cardano-db-sync/releases/tag/13.2.0.1)           | 15 February, 2024 |
+| [Cardano Rosetta](https://github.com/cardano-foundation/cardano-rosetta)            | [2.2.1](https://github.com/cardano-foundation/cardano-rosetta/releases/tag/2.2.1)           | 13 March, 2024    |
+| [Cardano GraphQL](https://github.com/cardano-foundation/cardano-graphql)            | [8.0.1](https://github.com/cardano-foundation/cardano-graphql/releases/tag/8.0.1)           | 22 March, 2024    |
+| [Cardano addresses](https://github.com/IntersectMBO/cardano-addresses)              | [3.12.0](https://github.com/IntersectMBO/cardano-addresses/releases/tag/3.12.0)             | 17 August, 2022   |
+| [Cardano wallet](https://github.com/cardano-foundation/cardano-wallet)              | [v2024-03-27](https://github.com/cardano-foundation/cardano-wallet/releases/tag/v2024-03-27)| 28 March, 2024    |
+| [Bech32](https://github.com/IntersectMBO/bech32)                                    | [1.1.5](https://github.com/IntersectMBO/bech32/releases/tag/v1.1.5)                         | 23 February, 2024 |