From e4eceefbb04083e3141f67f881c0b16f37313a29 Mon Sep 17 00:00:00 2001
From: Ferran Borreguero <ferranbt@protonmail.com>
Date: Thu, 14 Oct 2021 12:50:41 +0200
Subject: [PATCH] Merge conflicts

---
 eth/downloader/downloader.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 5132da42ae..fcd94b366d 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -815,7 +815,7 @@ func (d *Downloader) findAncestor(p *peerConnection, remoteHeader *types.Header)
 		return 0, err
 	}
 
-	ancestor, err = d.findAncestorBinarySearch(p, mode, localHeight, floor)
+	ancestor, err = d.findAncestorBinarySearch(p, mode, localHeight+1, floor)
 	if err != nil {
 		return 0, err
 	}