(cherry picked from commit dd983c803b6fe1a29946447ca818eaefdd7928ff) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryUpsertResolver.kt
(cherry picked from commit dd983c803b6fe1a29946447ca818eaefdd7928ff) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryUpsertResolver.kt