fix: merge coflicts

Author: 0marperez

gradle/wrapper/gradle-wrapper.properties

@@ -1,10 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-<<<<<<< Updated upstream
-distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-8.5-bin.zip
-=======
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
->>>>>>> Stashed changes
+distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists