diff --git a/app/build.gradle b/app/build.gradle
index 8e320174632e4decbd0490b22678fb15c8ec7714..6594e35e0357f9182bd1dbba395befb712e439ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,10 +40,8 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.+'
-<<<<<<< HEAD
    // androidTestImplementation 'com.android.support.test:runner:1.0.2'
-=======
+
     //androidTestImplementation 'com.android.support.test:runner:1.0.2'
->>>>>>> 36446a79a955a5ec115e137ca38bcb6976aede75
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
\ No newline at end of file