(cherry picked from commit d098eca69d0abc1c68e88811a13bad35c750f387) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt