diff --git a/src/test/java/TestComplete.java b/src/test/java/TestComplete.java
index 4076fede..7ca70857 100644
--- a/src/test/java/TestComplete.java
+++ b/src/test/java/TestComplete.java
@@ -1134,17 +1134,17 @@ public class TestComplete {
     }
 
     @Test
-<<<<<<< HEAD
     public void testBug337() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug337.jav");
         var clazz = classFiles.get("Bug337");
         var instance = clazz.getDeclaredConstructor().newInstance();
         clazz.getDeclaredMethod("main").invoke(instance);
-=======
+    }
+
+    @Test
     public void testBug338() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug338.jav");
         var clazz = classFiles.get("Bug338");
         var instance = clazz.getDeclaredConstructor().newInstance();
->>>>>>> ea217d16d5a1d635ac7fe961b98c2ad993c14ac5
     }
 }