fix merge conflicts

crypto/merkle/simple_proof.go

@@ -2,10 +2,10 @@ package merkle
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 
 	"github.com/pkg/errors"
+
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	cmn "github.com/tendermint/tendermint/libs/common"
 )