fixed messing up the merge conflict

Author: amjiao

app/build.gradle.kts

@@ -27,8 +27,8 @@ android {
     defaultConfig {
         applicationId = "com.cornellappdev.score"
         minSdk = 26
-        targetSdk = 34
-        versionCode = 5
+        targetSdk = 35
+        versionCode = 6
         versionName = "1.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }