implement and resolve conflict

CHANGELOG.md

build.gradle.kts

...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/CoreCacheManager.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

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

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

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

...java/nl/tudelft/queue/cache/StudentGroupCacheManager.java

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

...ain/java/nl/tudelft/queue/controller/AdminController.java

...ava/nl/tudelft/queue/controller/AssignmentController.java

...n/java/nl/tudelft/queue/controller/EditionController.java