fix merge conflict markets

Author: morganchen12

firestore/app/build.gradle.kts

@@ -44,11 +44,7 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
 
     // Import the BoM for the Firebase platform
-<<<<<<< HEAD
     implementation(platform("com.google.firebase:firebase-bom:34.12.0"))
-=======
-    implementation(platform("com.google.firebase:firebase-bom:34.8.0"))
->>>>>>> master
 
     // Declare the dependency for the Cloud Firestore library
     // When using the BoM, you don't specify versions in Firebase library dependencies
@@ -57,11 +53,7 @@ dependencies {
 
     // Firebase / Play Services
     implementation("com.google.firebase:firebase-auth")
-<<<<<<< HEAD
     implementation("com.google.android.gms:play-services-auth:21.5.1")
-=======
-    implementation("com.google.android.gms:play-services-auth:21.5.0")
->>>>>>> master
     implementation("com.google.firebase:firebase-functions")
 
     // GeoFire (for Geoqueries solution)