diff --git a/docs/_legacy/Mining.md b/docs/_legacy/Mining.md
index 30784d683b..fe0977751a 100644
--- a/docs/_legacy/Mining.md
+++ b/docs/_legacy/Mining.md
@@ -46,11 +46,7 @@ miner.setEtherbase(eth.accounts[2])
 
 Note that your etherbase does not need to be an address of a local account, just an existing one. 
 
-<<<<<<< HEAD
 There is an option [to add extra Data](../interface/javascript-console) (32 bytes only) to your mined blocks. By convention this is interpreted as a unicode string, so you can set your short vanity tag.
-=======
-There is an option [to add extra Data](../interface/javascript-console#adminminersetextra) (32 bytes only) to your mined blocks. By convention this is interpreted as a unicode string, so you can set your short vanity tag.
->>>>>>> 8e49d1571d52da8555847b9901f9d52d5c20ddb1
 
 ```
 miner.setExtra("ΞTHΞЯSPHΞЯΞ")
@@ -70,11 +66,7 @@ Header:
 
 See also [this proposal](https://github.com/ethereum/wiki/wiki/Extra-Data)
 
-<<<<<<< HEAD
 You can check your hashrate with [miner.hashrate](../interface/javascript-console), the result is in H/s (Hash operations per second). 
-=======
-You can check your hashrate with [miner.hashrate](../interface/javascript-console#adminminerhashrate), the result is in H/s (Hash operations per second). 
->>>>>>> 8e49d1571d52da8555847b9901f9d52d5c20ddb1
 
 ```
 > miner.hashrate
diff --git a/docs/_legacy/Swarm---distributed-preimage-archive.md b/docs/_legacy/Swarm---distributed-preimage-archive.md
index 4bd685f63f..77e79e1eab 100644
--- a/docs/_legacy/Swarm---distributed-preimage-archive.md
+++ b/docs/_legacy/Swarm---distributed-preimage-archive.md
@@ -14,7 +14,7 @@ title: Swarm - distributed preimage archive
 - Dani & Viktor on public wiki: https://github.com/ethereum/wiki/wiki/Distributed-Preimage-Archive
 - Dani on swarm hash: https://github.com/ethereum/wiki/wiki/Swarm-Hash
 - Dani on incentive system: https://github.com/ethersphere/swarm/blob/master/doc/incentives.md 
-- [The swarm smart contract](./swarm-contract)
+- The swarm smart contract
 - gav on url-hint https://github.com/ethereum/wiki/wiki/URL-Hint-Protocol
 - Gav on public wiki: https://github.com/ethereum/cpp-ethereum/wiki/Swarm
 - network (DEVp2p)
diff --git a/index.html b/index.html
index 3c77623074..fe855cd04d 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+root: ./
 css:
 - /static/styles/custom/home.css
 ---