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