diff --git a/docs/spec/README.md b/docs/spec/README.md
index 6492dc9392..e7507bf95e 100644
--- a/docs/spec/README.md
+++ b/docs/spec/README.md
@@ -5,7 +5,6 @@ the Cosmos Hub.
 
 NOTE: the specifications are not yet complete and very much a work in progress.
 
-<<<<<<< HEAD
 - [Basecoin](basecoin) - Cosmos SDK related specifications and transactions for
   sending tokens.
 - [Staking](staking) - Proof of Stake related specifications including bonding