diff --git a/gradlew b/gradlew
index 7642b96..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -83,12 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-<<<<<<< HEAD
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
 APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-=======
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
->>>>>>> 555347a (update to Gradl 8.1.1, fix tests, remove file logging)
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum