diff --git a/src/test/java/com/currencycloud/client/dirty/UpdateTest.java b/src/test/java/com/currencycloud/client/dirty/UpdateTest.java
index 70a1857..3c692f3 100644
--- a/src/test/java/com/currencycloud/client/dirty/UpdateTest.java
+++ b/src/test/java/com/currencycloud/client/dirty/UpdateTest.java
@@ -7,7 +7,6 @@
 import com.currencycloud.client.model.Entity;
 import org.junit.Test;
 
-<<<<<<< HEAD
 import java.lang.reflect.Field;
 
 import static org.hamcrest.Matchers.equalTo;