diff --git a/android/.gradle/config.properties b/android/.gradle/config.properties
index 91ea04e..6b0e7f7 100644
--- a/android/.gradle/config.properties
+++ b/android/.gradle/config.properties
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 #Mon May 26 14:33:47 GMT+08:00 2025
 java.home=D\:\\Android\\AS_INstall\\jbr
+=======
+#Sat May 24 23:39:46 CST 2025
+java.home=D\:\\Andr\\jbr
+>>>>>>> a11e684a7b53b2288bd2435ed63bc73bcd82db22
diff --git a/android/.idea/deploymentTargetSelector.xml b/android/.idea/deploymentTargetSelector.xml
index 15e2a68..531a5e8 100644
--- a/android/.idea/deploymentTargetSelector.xml
+++ b/android/.idea/deploymentTargetSelector.xml
@@ -13,6 +13,15 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
+      <SelectionState runConfigName="MovenetLightningTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="MovenetThunderTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="MovenetMultiPoseTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/android/local.properties b/android/local.properties
index 70f5ae8..8b9df9c 100644
--- a/android/local.properties
+++ b/android/local.properties
@@ -4,5 +4,10 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
+<<<<<<< HEAD
 #Mon May 26 14:34:26 GMT+08:00 2025
 sdk.dir=D\:\\wangjiachen\\sdk
+=======
+#Sat May 24 23:39:55 CST 2025
+sdk.dir=C\:\\Users\\26891\\AppData\\Local\\Android\\Sdk
+>>>>>>> a11e684a7b53b2288bd2435ed63bc73bcd82db22