diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java
index 2d630b4af9..3f7bcad6db 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java
@@ -112,9 +112,4 @@ private enum InternalRuntime {
             this.path = path;
         }
     }
-
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> upstream/v3_openjdk