Conflicts:

.gitignore

.gradle/8.12.1/executionHistory/executionHistory.bin

.gradle/8.12.1/executionHistory/executionHistory.lock

.gradle/8.12.1/fileHashes/fileHashes.bin

.gradle/8.12.1/fileHashes/fileHashes.lock

.gradle/8.12.1/fileHashes/resourceHashesCache.bin

.gradle/buildOutputCleanup/buildOutputCleanup.lock

.gradle/buildOutputCleanup/outputFiles.bin

build/reports/problems/problems-report.html