(cherry picked from commit 4bc228880654320fdeec3d337d4dd948c5ab1269) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
(cherry picked from commit 4bc228880654320fdeec3d337d4dd948c5ab1269) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt