resolved merge conflicts

.gitlab-ci.yml

CHANGELOG.md

build.gradle.kts

gradle/wrapper/gradle-wrapper.jar

gradle/wrapper/gradle-wrapper.properties

gradlew

gradlew.bat

src/main/java/nl/tudelft/queue/DevDatabaseLoader.java

src/main/java/nl/tudelft/queue/PageUtil.java

src/main/java/nl/tudelft/queue/QueueApplication.java

src/main/java/nl/tudelft/queue/QueueMvcConfig.java

...n/java/nl/tudelft/queue/cache/AssignmentCacheManager.java

...main/java/nl/tudelft/queue/cache/ClusterCacheManager.java

src/main/java/nl/tudelft/queue/cache/CohortCacheManager.java

src/main/java/nl/tudelft/queue/cache/CourseCacheManager.java

...main/java/nl/tudelft/queue/cache/EditionCacheManager.java

...nl/tudelft/queue/cache/EditionCollectionCacheManager.java

...java/nl/tudelft/queue/cache/EditionRolesCacheManager.java

src/main/java/nl/tudelft/queue/cache/ModuleCacheManager.java

src/main/java/nl/tudelft/queue/cache/PersonCacheManager.java