From b9278fdba8bd8533ef3dc129c365e02d138f98c2 Mon Sep 17 00:00:00 2001
From: Sylvessa <225480449+sylvessa@users.noreply.github.com>
Date: Fri, 27 Mar 2026 01:16:58 -0500
Subject: [PATCH] Fix oopsy

---
 Minecraft.Client/Windows64/Windows64_Minecraft.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 3aadcae50..58c5bd094 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -1277,13 +1277,7 @@ static Minecraft* InitialiseMinecraftRuntime()
 
 	ProfileManager.SetDebugFullOverride(true);
 
-<<<<<<< HEAD
 	newauthManager::Get().TryRestoreActiveJavaAccount();
-=======
-	// Temporary isolation: bypass startup auth restore to verify whether
-	// release startup crash is caused by newauth initialization.
-	//newauthManager::Get().TryRestoreActiveJavaAccount();
->>>>>>> 5987473f5d44351cbafd1d3012d0a4cef5ba786a
 
 	Tesselator::CreateNewThreadStorage(1024 * 1024);
 	AABB::CreateNewThreadStorage();