diff --git a/gradle.properties b/gradle.properties
index 57264122..53ae0ae4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
-<<<<<<< HEAD
-=======
-android.enableUnitTestBinaryResources=true
->>>>>>> use robolectric for android tests