fix merge conflict

source/docs/fluffy.md

@@ -6,6 +6,10 @@ title: Fluffy: an ultra-light client for Ethereum
 Nimbus has joined the Ethereum Foundation’s Portal Network team as one of the launch clients for the portal network.
 
 In a sentence, [the Portal Network](https://github.com/ethereum/stateless-ethereum-specs/blob/master/portal-network.md#network-functionality) is an in-progress cross-team effort to re-imagine the ethereum light client, and develop a practical and functional light client experience.
+=======
+Nimbus has joined the Ethereum Foundation’s Portal Network team as one of the launch clients for the Portal Network.
+
+In a sentence, [the Portal Network](https://github.com/ethereum/stateless-ethereum-specs/blob/master/portal-network.md#network-functionality) is an in-progress cross-team effort to re-imagine the Ethereum light client, and develop a practical and functional light client experience.
 
 In particular, our aim is to work together with the EF to develop a new set of Ethereum protocols alongside the existing Eth protocol that will specifically serve this new way of accessing Ethereum data.
 
@@ -20,10 +24,12 @@ This has the potential to both improve the security and privacy of our users (we
 ## Resources
 
 - [Our introductory post](https://our.status.im/nimbus-fluffly/)
-- The Nimbus Light Portal Network client (nlpn) can be found in our nimbus-eth1 repository: https://github.com/status-im/nimbus-eth1/tree/master/fluffy
 - The Portal Wire protocol is added to the nim-eth repository, as Node Discovery v5.1 sub-protocol: https://github.com/status-im/nim-eth
 - Specifications: https://github.com/ethereum/stateless-ethereum-specs/
 - Website: https://www.ethportal.net/
 - Some quick notes regarding first Portal Wire interop tests with ddht and trin- https://gist.github.com/kdeme/36795f5deae7d02ce1785e9c7d501e53
+- Fluffy, our Portal Network client can be found in our nimbus-eth1 repository: https://github.com/status-im/nimbus-eth1/tree/master/fluffy
+- Portal Network specifications: https://github.com/ethereum/stateless-ethereum-specs/blob/master/portal-network.md
+- Portal Network website: https://www.ethportal.net/
 - [The winding road to functional light clients](https://snakecharmers.ethereum.org/the-winding-road-to-functional-light-clients/) blog post series of Piper Merriam
 - [This video talk](https://www.youtube.com/watch?v=MZxqRs_tLNs) about the subject.

themes/navy/layout/index.swig

@@ -71,7 +71,7 @@ Nimbus is a client implementation for both Ethereum 2.0 and Ethereum 1.0 that st
             </div>
             <div class="contribute">
                 <h3>Suppport</h3>
-                <p>As an Ethereum public good, largely dependent on both Status and the Ethereum Foundation for funding, grants are our lifeblood. See <a href="https://etherscan.io/address/0x70E47C843E0F6ab0991A3189c28F2957eb6d3842">here</a> for our donation address.
+                <p>As an Ethereum public good, largely dependent on both Status and the Ethereum Foundation for funding, grants are our lifeblood. See <a href="https://etherscan.io/address/0x70E47C843E0F6ab0991A3189c28F2957eb6d3842">here</a> for our donation address</p>
                 <p>
                     <a href="https://gitcoin.co/grants/137/nimbus">Support us on Gitcoin</a>
                     <span><a href="https://gitcoin.co/explorer?keywords=nimbus&order_by=-web3_created"><img src="../img/arrow_ogn.png" /></a></span>

themes/navy/layout/partial/footer.swig

@@ -21,7 +21,7 @@
                     <li class="footer-link"><a href="https://news.nimbus.team/" target="_blank">News</a></li>
                     <li class="footer-link"><a href="https://subscribe.nimbus.team/" target="_blank">Newsletter</a></li>
                     <li class="footer-link"><a href="https://etherscan.io/address/0x70E47C843E0F6ab0991A3189c28F2957eb6d3842" target="_blank">Donate</a></li>                    
-                    <li class="footer-link"><a href="https://www.iubenda.com/privacy-policy/94457202" target="_blank">Privacy Policy</a></li>
+                    <li class="footer-link"><a href="https://status.im/privacy-policy/" target="_blank">Privacy Policy</a></li>
                   </ul>
                 </div>