diff --git a/src/main.rs b/src/main.rs
index 8aacaf8..4ed07bb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -140,16 +140,6 @@ fn init() -> anyhow::Result<()> {
         f.write_all(include_bytes!("../assets/src/main/Main.java"))?;
     }
 
-<<<<<<< HEAD
-    // Make src/test/Test.java
-    if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open(
-        DIR_TEST
-            .clone()
-            .join("Test")
-            .with_extension(JAVA_EXT_SOURCE),
-    ) {
-        f.write_all(include_bytes!("../assets/src/test/Test.java"))?;
-=======
     // Make src/test/MainTest.java
     if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open(
         DIR_TEST
@@ -158,7 +148,6 @@ fn init() -> anyhow::Result<()> {
             .with_extension(JAVA_EXT_SOURCE),
     ) {
         f.write_all(include_bytes!("../assets/src/test/MainTest.java"))?;
->>>>>>> e79c26c (Fix build; Correct target/ path in generated .gitignore)
     }
 
     // git init .