diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4f0..009885e1e44 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,10 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+=======
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+>>>>>>> 8a92bbb6 (Downgrade gradle to coninute testing on windows server 2016 (#18263))
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42690..7580edd0483 100755
--- a/gradlew
+++ b/gradlew
@@ -84,7 +84,12 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+<<<<<<< HEAD
 APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+=======
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+>>>>>>> 8a92bbb6 (Downgrade gradle to coninute testing on windows server 2016 (#18263))
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum