From 72d6a7134d9233d1f56a1c8c0f5a57f57224b703 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Mon, 8 Jan 2024 23:28:17 +0400
Subject: [PATCH] Merge fix

---
 Mage/src/main/java/mage/game/GameImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java
index 99de9ee1369..21e76cef684 100644
--- a/Mage/src/main/java/mage/game/GameImpl.java
+++ b/Mage/src/main/java/mage/game/GameImpl.java
@@ -1594,7 +1594,7 @@ public abstract class GameImpl implements Game {
     public void playPriority(UUID activePlayerId, boolean resuming) {
         int priorityErrorsCount = 0;
         infiniteLoopCounter = 0;
-        int rollbackBookmark = 0;
+        int rollbackBookmarkOnPriorityStart = 0;
         clearAllBookmarks();
         try {
             applyEffects();