diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
index f0150578ae..3ca69d8847 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
@@ -3,10 +3,7 @@ package com.baeldung.concurrent.daemon;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-<<<<<<< HEAD
-=======
 import org.junit.Ignore;
->>>>>>> d54917c7e9f0f74c40982571af8ac9f61782b7cb
 import org.junit.Test;
 
 public class DaemonThreadTest {