From 5047a90e51839469a50ee9bac757df94f45248c3 Mon Sep 17 00:00:00 2001
From: Andrea V <1577639+karimodm@users.noreply.github.com>
Date: Wed, 4 Oct 2023 14:19:20 +0200
Subject: [PATCH] Merge-to-master orphaned conflicts instead of invalidating
 the block

---
 pkg/protocol/engine/booker/inmemorybooker/booker.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkg/protocol/engine/booker/inmemorybooker/booker.go b/pkg/protocol/engine/booker/inmemorybooker/booker.go
index e057a764a..e24fa8259 100644
--- a/pkg/protocol/engine/booker/inmemorybooker/booker.go
+++ b/pkg/protocol/engine/booker/inmemorybooker/booker.go
@@ -158,12 +158,9 @@ func (b *Booker) book(block *blocks.Block) error {
 			return ierrors.Errorf("failed to load transaction %s for block %s", conflictID.String(), block.ID())
 		}
 
-		if orphanedSlot, orphaned := txMetadata.IsOrphaned(); orphaned {
-			if orphanedSlot <= block.SlotCommitmentID().Slot() {
-				block.SetInvalid()
-
-				return nil
-			}
+		if orphanedSlot, orphaned := txMetadata.IsOrphaned(); orphaned && orphanedSlot <= block.SlotCommitmentID().Slot() {
+			// Merge-to-master orphaned conflicts.
+			conflictsToInherit.Delete(conflictID)
 		}
 	}