Merge rchain#3809

3809: Bugfix. Remove genesis from conflict set. r=nzpr a=nzpr Co-authored-by: nutzipper <1746367+nzpr@users.noreply.github.com>
jeffrey-l-turner · Aug 30, 2022 · fd537b8 · fd537b8
2 parents ae983fc + 7227a7e
commit fd537b8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/casper/src/main/scala/coop/rchain/casper/merging/MergeScope.scala b/casper/src/main/scala/coop/rchain/casper/merging/MergeScope.scala
@@ -75,7 +75,7 @@ object MergeScope {
       genesisOpt.map(_.id)
     }
 
-    (MergeScope(fScopeIds, cScopeIds), baseMsg)
+    (MergeScope(fScopeIds, cScopeIds -- baseMsg.toSet), baseMsg)
   }
 
   def merge[F[_]: Concurrent: Log](