fix conflict

content/navigation/navigation.md

@@ -16,6 +16,31 @@ navLinks:
     external: false
     expandable: false
 
+  - name: oldToken
+    link: ""
+    external: false
+    expandable: true
+    submenu:
+      - title: Token Introduction
+        path: /oldtoken
+      - title: Buy TFT
+        path: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
+        external: true
+      - title: Tokenomics
+        path: https://threefold.io/info/threefold#/threefold__tokenomics
+        external: true
+      - title: Distribution
+        path: https://threefold.io/info/threefold#/threefold__token_overview
+        external: true
+      - title: FAQ / Forum
+        path: https://forum.threefold.io/c/threefold-token/tft-faq/57
+        external: true
+  
+  - name: Farming
+    link: "" # /dropdown
+    external: false
+    expandable: false
+
   
   - name: Community
     link: "" # /dropdown

content/page/oldtoken/oldtoken.md

@@ -0,0 +1,23 @@
+---
+id: oldtoken
+metaTitle: ThreeFold | Token (TFT)
+metaDesc: The Threefold Token is the official currency of ThreeFold – the engine for a planet positive and data sovereign Internet. Now is the perfect time to get involved.
+metaImg: ./token_header.png
+header_slogan: WE ARE GROWING NOW
+header_title: YOU GROW WHEN THE THREEFOLD GRID GROWS
+header_image: ./token_header.png
+header_altImg: ThreeFold Token
+header_excerpt: The Threefold Token is the official currency of ThreeFold – the engine for a planet positive and data sovereign Internet. Now is the perfect time to get involved.
+button: Get Tokens
+link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
+comparisonMain: token_comparison
+comparisonSecs: [expand_grid, invest_token]
+productsMain: token_product
+productData: [buy_tft, swap_tft, spend_tft]
+partenershipsMain: cryptocurrency_main
+partnerships:
+  [be_ur_bank, secure, transact_p2p, backed, decentralized, lives_stellar]
+brandPanel: dive_TFT
+cta3: token_cta3
+cta2: token_cta2
+---

content/page/token/token.md

@@ -1,23 +1,14 @@
 ---
 id: token
-metaTitle: ThreeFold | Token (TFT)
-metaDesc: The Threefold Token is the official currency of ThreeFold – the engine for a planet positive and data sovereign Internet. Now is the perfect time to get involved.
+metaTitle: ThreeFold | Token
+metaDesc:  A digital currency that enables a peer-to-peer digital economy.
 metaImg: ./token_header.png
-header_slogan: WE ARE GROWING NOW
-header_title: YOU GROW WHEN THE THREEFOLD GRID GROWS
+header_slogan: 
+header_title: INSPIRED BY AUTONOMY
 header_image: ./token_header.png
-header_altImg: ThreeFold Token
-header_excerpt: The Threefold Token is the official currency of ThreeFold – the engine for a planet positive and data sovereign Internet. Now is the perfect time to get involved.
-button: Get Tokens
-link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
-comparisonMain: token_comparison
-comparisonSecs: [expand_grid, invest_token]
-productsMain: token_product
-productData: [buy_tft, swap_tft, spend_tft]
-partenershipsMain: cryptocurrency_main
-partnerships:
-  [be_ur_bank, secure, transact_p2p, backed, decentralized, lives_stellar]
-brandPanel: dive_TFT
-cta3: token_cta3
-cta2: token_cta2
+header_altImg: threefold
+header_excerpt: A digital currency that enables a peer-to-peer digital economy.
+solution_image: 
+button: 
+link: 
 ---

src/components/marketing/sections/cta-sections/Header.vue

@@ -350,6 +350,21 @@
       </div> -->
     </div>
 
+    <div
+      class="flex flex-wrap text-center lg:text-left lg:pt-10 -mx-2"
+      v-else-if="id == 'token'"
+    >
+      <div class="px-2 lg:mt-10 order-1 lg:order-none mx-auto text-center">
+        <div class="w-1/2 mx-auto px-2 self-center">
+          <g-image :src="img" :alt="altImg" />
+        </div>
+        <h2 class="text-8xl uppercase mb-6 mt-20 leading-none font-heading">
+          {{ title }}
+        </h2>
+        <div class="mb-8 text-2xl leading-relaxed" v-html="excerpt"></div>
+      </div>
+    </div>
+
     <div
       class="flex flex-wrap text-center lg:text-left lg:pt-10 -mx-2"
       v-else-if="id == 'grid'"