From 98339ade14a86fbabb6c21fe164445afa4706ab6 Mon Sep 17 00:00:00 2001
From: Fayaz Shaikh <61674751+fayaz12g@users.noreply.github.com>
Date: Wed, 4 Mar 2026 13:42:49 -0500
Subject: [PATCH] handle merge conflict

---
 Minecraft.Client/Windows64/Windows64_Minecraft.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index dc03371ea..1db7f5165 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -592,12 +592,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				}
 			}
 		}
-		return DefWindowProc(hWnd, message, wParam, lParam);
+		break;
 	case WM_SIZE:
 		{
 			UpdateAspectRatio(LOWORD(lParam), HIWORD(lParam));
 		}
-	break;
+		break;
 	default:
 		return DefWindowProc(hWnd, message, wParam, lParam);
 	}