diff --git a/README.md b/README.md
index e943f182..3ad84c99 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ test.all(common)
 
 ## API
 
-In order to be considered "valid", an IPFS core implementation  must expose the API described in [/API](/API). You can also use this loose spec as documentation for consuming the core APIs. Here is an outline of the contents of that directory:
+In order to be considered "valid", an IPFS core implementation  must expose the API described in [/SPEC](/SPEC). You can also use this loose spec as documentation for consuming the core APIs. Here is an outline of the contents of that directory:
 
 - **Files**
   - [files](/SPEC/FILES.md)
@@ -102,6 +102,7 @@ In order to be considered "valid", an IPFS core implementation  must expose the
   - [Miscellaneous](/SPEC/MISCELLANEOUS.md)
   - [config](/SPEC/CONFIG.md)
   - [stats](/SPEC/STATS.md)
+  - [repo](/SPEC/REPO.md)
 
 ## Contribute
 
diff --git a/src/index.js b/src/index.js
index 39cdfbff..808aca3c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,8 +12,5 @@ exports.dht = require('./dht')
 exports.dag = require('./dag')
 exports.pubsub = require('./pubsub')
 exports.key = require('./key')
-<<<<<<< HEAD
 exports.stats = require('./stats')
-=======
->>>>>>> fix: linting
 exports.repo = require('./repo')