diff --git a/contentstack/build.gradle b/contentstack/build.gradle
index 20334739..a4f04228 100755
--- a/contentstack/build.gradle
+++ b/contentstack/build.gradle
@@ -103,13 +103,8 @@ android {
         versionCode 1
         versionName "1.0"
         useLibrary 'org.apache.http.legacy'
-<<<<<<< Updated upstream
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         signingConfig signingConfigs.release
-=======
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-       signingConfig signingConfigs.release
->>>>>>> Stashed changes
     }