From 70c8709ab7dcda45c176711033c9d13353d65545 Mon Sep 17 00:00:00 2001
From: Callum Waters <cmwaters19@gmail.com>
Date: Tue, 24 Aug 2021 19:01:31 +0200
Subject: [PATCH] fix conflict

---
 state/state.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/state/state.go b/state/state.go
index 3e13b4e5d..c33a1452c 100644
--- a/state/state.go
+++ b/state/state.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	tmtime "github.com/tendermint/tendermint/libs/time"
 	"github.com/tendermint/tendermint/pkg/block"
 	"github.com/tendermint/tendermint/pkg/consensus"
 	"github.com/tendermint/tendermint/pkg/evidence"
@@ -291,7 +290,7 @@ func (state State) MakeBlock(
 // the votes sent by honest processes, i.e., a faulty processes can not arbitrarily increase or decrease the
 // computed value.
 func MedianTime(commit *metadata.Commit, validators *consensus.ValidatorSet) time.Time {
-	weightedTimes := make([]*tmtime.WeightedTime, len(commit.Signatures))
+	weightedTimes := make([]*weightedTime, len(commit.Signatures))
 	totalVotingPower := int64(0)
 
 	for i, commitSig := range commit.Signatures {