diff --git a/Ryujinx/Ui/AboutWindow.cs b/Ryujinx/Ui/AboutWindow.cs
index bde1593d69..bb02a82648 100644
--- a/Ryujinx/Ui/AboutWindow.cs
+++ b/Ryujinx/Ui/AboutWindow.cs
@@ -49,6 +49,14 @@ namespace Ryujinx.Ui
                 string currentVersionJson;
                 string currentVersionBranch;
                 string currentVersionPr;
+<<<<<<< Updated upstream
+=======
+                var VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json")));
+                var _JRoot = VersionJSON[""];
+                currentVersionJson = (string)_JRoot["BuildVer"];
+                currentVersionPr = (string)_JRoot["BuildPR"];
+                currentVersionBranch = (string)_JRoot["BuildBranch"];
+>>>>>>> Stashed changes
 
                 JObject VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json")));