fix conflicts of merging dev

Session/Conversations/ConversationVC.swift

@@ -1561,10 +1561,9 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
         }
         
         self.outdatedClientBanner.update(
-            message: String(
+            message: "disappearingMessagesLegacy"
-                format: "DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER".localized(),
+                .put(key: "name", value: Profile.displayName(id: outdatedMemberId, threadVariant: self.viewModel.threadData.threadVariant))
-                Profile.displayName(id: outdatedMemberId, threadVariant: self.viewModel.threadData.threadVariant)
+                .localized(),
-            ),
             dismiss: self.removeOutdatedClientBanner
         )
 

Session/Meta/AppDelegate.swift

@@ -428,25 +428,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 
             // Offer the 'Restore' option if it was a migration error
             case .databaseError:
-<<<<<<< HEAD
                 alert.addAction(UIAlertAction(title: "onboardingAccountExists".localized(), style: .destructive) { _ in
-                    if SUKLegacy.hasLegacyDatabaseFile {
-                        // Remove the legacy database and any message hashes that have been migrated to the new DB
-                        try? SUKLegacy.deleteLegacyDatabaseFilesAndKey()
-                        
-                        Storage.shared.write { db in
-                            try SnodeReceivedMessageInfo.deleteAll(db)
-                        }
-                    }
-                    else {
-                        // If we don't have a legacy database then reset the current database for a clean migration
-                        Storage.resetForCleanMigration()
-                    }
-=======
-                alert.addAction(UIAlertAction(title: "vc_restore_title".localized(), style: .destructive) { _ in
                     // Reset the current database for a clean migration
                     Storage.resetForCleanMigration()
->>>>>>> dev
                     
                     // Hide the top banner if there was one
                     TopBannerController.hide()

Session/Meta/Translations/en.lproj/Localizable.strings

@@ -617,6 +617,7 @@
 
 // NOT IN THE LIST YET
 "APP_STARTUP_EXIT" = "Exit";
+"DATABASE_UNSUPPORTED_MIGRATION" = "You are trying to updated from a version which no longer supports upgrading\n\nIn order to continue to use session you need to restore your device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";
 "DATABASE_STARTUP_FAILED" = "An error occurred when opening the database\n\nYou can export your application logs to share for troubleshooting or you can try to restore your device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";
 "DATABASE_RESTORE_FAILED" = "An error occurred when opening the restored database\n\nYou can export your application logs to share for troubleshooting but to continue to use Session you may need to reinstall";
 "APP_STARTUP_TIMEOUT" = "The app is taking a long time to start\n\nYou can continue to wait for the app to start, export your application logs to share for troubleshooting or you can try to open the app again";