chore: resolve merge conflicts

Author: nud3l

docs/README.md

@@ -1,43 +1,35 @@
 # InterBTC & Kintsugi Documentation
 
-## Radically Open Bitcoin for Decentralized Finance 
+## Radically Open Bitcoin for Decentralized Finance
 
 
-**interBTC** is Bitcoin on any blockchain. A 1:1 Bitcoin-backed asset, fully collateralized, interoperable, and censorship-resistant. interBTC will be hosted as a Polkadot parachain and connected to Cosmos, Ethereum and other major DeFi networks. 
+**interBTC** is Bitcoin on any blockchain. A 1:1 Bitcoin-backed asset, fully collateralized, interoperable, and censorship-resistant. interBTC will be hosted as a Polkadot parachain and connected to Cosmos, Ethereum and other major DeFi networks.
 
-**Kintsugi** is Interlay’s canary network for interBTC, a testnet with real economic value deployed on Kusama (Polkadot’s canary network). Kintsugi and interBTC share the same code base - with the difference that Kintsugi will be 2-3 releases ahead of interBTC with more experimental features. 
+**Kintsugi** is Interlay’s canary network for interBTC, a testnet with real economic value deployed on Kusama (Polkadot’s canary network). Kintsugi and interBTC share the same code base - with the difference that Kintsugi will be 2-3 releases ahead of interBTC with more experimental features.
 
 ![Cryptocurrency-backed Assets](_assets/img/CbA.jpg)
 
 ### Issue, Trade, and Redeem
 
 The life-cycle of interBTC follows the three main protocols:
 
-- **Issue:** Lock your BTC with a Vault. Pick one, or run your own. Your BTC is always safe and insured by Vault collateral. 
+- **Issue:** Lock your BTC with a Vault. Pick one, or run your own. Your BTC is always safe and insured by Vault collateral.
 - **Mint:** Get interBTC at a 1:1 ration to your locked BTC.
-- **BTC DeFi:** Earn on your Bitcoin. Use interBTC as collateral, for lending, yield farming and more. On Polkadot, Kusama, Cosmos, Ethereum and other major DeFi platforms. 
+- **BTC DeFi:** Earn on your Bitcoin. Use interBTC as collateral, for lending, yield farming and more. On Polkadot, Kusama, Cosmos, Ethereum and other major DeFi platforms.
 - **Redeem:** Redeem interBTC for actual BTC on Bitcoin - trustless and anytime you want.
 
 ### Radically Open & Secured by Insurance
 
-<<<<<<< HEAD
 What makes interBTC unique is the strict dedication to being trustless and decentralized.
-=======
-What makes interBTC unique is the strict dedication to being trustless and decentralized. Users
->>>>>>> master
 
-- **Secured by Insurance**. Vaults lock collateral on the interBTC parachain in various digital assets - in a MakerDAO-inspired multi-collateral system. If Vaults misbehave, their collateral is slashed and users reimbursed. As a user, you only trust that Bitcoin and the DeFi platform you use are secure. 
+- **Secured by Insurance**. Vaults lock collateral on the interBTC parachain in various digital assets - in a MakerDAO-inspired multi-collateral system. If Vaults misbehave, their collateral is slashed and users reimbursed. As a user, you only trust that Bitcoin and the DeFi platform you use are secure.
 
 - **Radically Open**. Anyone can become a Vault and help secure interBTC, anytime. Yes, you can run your own Vault!
 
-
-
 ## Guides
 
-
 **1.  [Learn about Kintsugi, the canary network on Kusama - going live NOW](kintsugi/overview.md)**
 
-
 **2.  [Get a detailed overview of interBTC](start/overview.md)**
 
 **3.  [Issue your first interBTC](start/issue.md)**
@@ -52,4 +44,4 @@ What makes interBTC unique is the strict dedication to being trustless and decen
 
 ## Contributions
 
-interBTC is an open-source project. We welcome contributions to the code and documentation. Feel free to checkout our [GitHub](https://github.com/interlay) or [Discord](https://discord.gg/KgCYK3MKSf).
+interBTC and Kintsugi are an open-source projects. We welcome contributions to the code and documentation. Feel free to checkout our [GitHub](https://github.com/interlay) and [Discord](https://discord.gg/KgCYK3MKSf).

docs/kintsugi/crowdloans.md

@@ -1,73 +1,41 @@
 # The Kintsugi Crowdloan
 
 Kintsugi participates in the Kusama parachain auctions and supports a crowdloan to enable the community to vote.
-To participate in the crowdloan, you need to lock your KSM and vote for Kintsugi to become a parachain. 
+To participate in the crowdloan, you need to lock your KSM and vote for Kintsugi to become a parachain.
 
 Below is a summary of the Kintsugi crowdloan details, as described in the [token economy whitepaper released by Kintsugi Labs](https://raw.githubusercontent.com/interlay/whitepapers/master/Kintsugi_Token_Economy.pdf).
 
-
-<<<<<<< HEAD
-###  Hard Facts
-=======
-##  Hard Facts
->>>>>>> master
+## Hard Facts
 
 * **Target slot: 6 - 10**
 * **Lease duration: 8 periods (maximum lease duration ~48 weeks)**
 * **Max. lockup target: 200 000 KSM**
 
-<<<<<<< HEAD
-### Crowdloan Airdrop: 12% 
-
-* **Main: 10% (1 million KINT)** of the initial 4-year KINT supply, with the following vesting schedule:
-  
-  * **30% transferrable** at launch
-  * Remaining **70% linearly vested** over 48-week parachain lease period.
-
-* **Extra: 2%** in-protocol airdrops for crowdloan participants who run Vaults and mint kBTC, **not subject to vesting**.
-
-
-The **main 10%** airdrop will feature the following **special allocations**, to create a proactive crowdloan process:
-=======
-#### Crowdloan Airdrop: 12%
-
+### Crowdloan Airdrop: 12%
 
-
-* **Crowdloan: 10% (1 million KINT)** of the initial 4-year KINT supply 
+* **Crowdloan: 10% (1 million KINT)** of the initial 4-year KINT supply
 * **Extra 2%** in-protocol airdrops for crowdloan participants who run Vaults and mint kBTC.
 
 To create a proactive crowdloan process, Kintsugi features the following **special airdrops:**
->>>>>>> master
-
-
 
-* **Early**: 5% for first 3 days of crowdloan 
-* **Referral**: 5% for the referrer and referred 
+* **Early**: 5% for first 3 days of crowdloan
+* **Referral**: 5% for the referrer and referred
 * **Success**: up to 100 000 additional KINT if specific KSM lockup targets are achieved. See table:
 
-
 ![Crowdloan Bonuses](../_assets/img/kintsugi/crowdloan_bonuses.png)
 
-
 Any KINT not used for the Core, Early, Referral and Success Airdrop will be distributed proportionally among all participants, further increasing the ratio of KINT per locked KSM.
 
-<<<<<<< HEAD
-### Participating in the Crowdloan 
-=======
-## Participating in the Crowdloan 
->>>>>>> master
+## Participating in the Crowdloan
 
-The crowdloan is a fully permissionless event - you make your own judgement on if and how you would like to participate. 
+The crowdloan is a fully permissionless event - you make your own judgement on if and how you would like to participate.
 
 We recommend the following ways to participate:
 
 1. Participate via the [Kintsugi crowdloan website](https://kintsugi.interlay.io/) using the Polkadot.js browser extension.
 2. Participate via partner exchanges.
 3. Participate via partner mobile wallets.
 
-<<<<<<< HEAD
-#### Guides
-=======
 ### Guides
->>>>>>> master
-Step-by-step guides incl. screenshots will be posted here shortly.
+
+Step-by-step guides incl. screenshots will be posted here shortly.