fix conflict

diff --cc protocol/bc/types/block_header.go
index 1a52eab,1a52eab..7b1c25e
--- 1/protocol/bc/types/block_header.go
--- 2/protocol/bc/types/block_header.go
+++ b/protocol/bc/types/block_header.go
@@@ -19,7 -19,7 +19,6 @@@ type BlockHeader struct 
        PreviousBlockHash bc.Hash // The hash of the previous block.
        Timestamp         uint64  // The time of the block in seconds.
        BlockWitness
--      SupLinks
        BlockCommitment
  }