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();