chore: resolve merge conflicts in dependency versions and gradle wrapper

Author: wf9a5m75

.claude/settings.local.json

@@ -48,7 +48,9 @@
       "Bash(xcodebuild -scheme \"ios-sdk-core\" -destination \"generic/platform=iOS Simulator\" build)",
       "Bash(xcodebuild -list)",
       "Bash(xcodebuild -scheme MapConductorSampleApp -destination \"generic/platform=iOS Simulator\" build)",
-      "Bash(xcodebuild -workspace MapConductorSampleApp.xcworkspace -scheme MapConductorSampleApp -destination 'generic/platform=iOS Simulator' build)"
+      "Bash(xcodebuild -workspace MapConductorSampleApp.xcworkspace -scheme MapConductorSampleApp -destination 'generic/platform=iOS Simulator' build)",
+      "Bash(git -C /Users/masashi/android-sdk/android-geojson-layer log --oneline bfa194c07a..e75c70bae)",
+      "Bash(git -C /Users/masashi/android-sdk/android-geojson-layer log --oneline e75c70bae..bfa194c07a)"
     ],
     "deny": [],
     "ask": []

gradle/libs.versions.toml

@@ -20,11 +20,7 @@ lifecycleViewmodelCompose = "2.10.0"
 # gradle.properties?kotlinCompilerExtensionVersion??????
 compose = "1.11.2"
 composeBom = "2026.05.01"
-<<<<<<< HEAD
 okhttp = "5.4.0"
-=======
-okhttp = "5.3.2"
->>>>>>> b6e42dde98a8f4d60f94fdd25f3738d99ef35059
 runner = "1.7.0"
 
 mapboxAndroid = "11.24.3"
@@ -34,11 +30,7 @@ arcgisMapsKotlin = "200.7.0"
 vectordrawable = "1.2.0"
 ktLint = "14.2.0"
 geographiclib = "2.1"
-<<<<<<< HEAD
 mapLibreSdk = "13.3.0"
-=======
-mapLibreSdk = "13.2.0"
->>>>>>> b6e42dde98a8f4d60f94fdd25f3738d99ef35059
 mapLibreAnnotation = "3.0.2"
 runtime = "1.11.2"
 runtimeVersion = "1.11.2"

gradle/wrapper/gradle-wrapper.properties

@@ -1,10 +1,6 @@
 #Fri Apr 11 01:40:57 PDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-<<<<<<< HEAD
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
-=======
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
->>>>>>> b6e42dde98a8f4d60f94fdd25f3738d99ef35059
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists