diff --git a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
index 42ec7ae4bd..ea356d307a 100644
--- a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
+++ b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
@@ -16,14 +16,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class DozerTest {
-<<<<<<< HEAD
 	DozerBeanMapper mapper = new DozerBeanMapper();
 	private final long GMT_DIFFERENCE=46800000;
-=======
-
-	private DozerBeanMapper mapper = new DozerBeanMapper();
->>>>>>> 6f2ccdf18729969951fc37e635d24c30dd9b43d5
-
 	@Before
 	public void before() throws Exception {
 		mapper = new DozerBeanMapper();