Server: Merge conflicts behoben. (randomCategories)