diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index fc3218f5e..e8a16a1f3 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1156,6 +1156,7 @@ INSERT INTO msgs
             part.error.take().unwrap_or_default(),
             ephemeral_timer,
             ephemeral_timestamp,
+<<<<<<< HEAD
 <<<<<<< HEAD
             if is_partial_download.is_some() {
                 DownloadState::Available
@@ -1165,6 +1166,9 @@ INSERT INTO msgs
 =======
             mime_parser.hop_info
 >>>>>>> 4fa0edcf (add hop info)
+=======
+            mime_parser.hop_info
+>>>>>>> 3f8878fe7a756257dc6170712bc034d5b411ec3d
         ])?;
         let row_id = conn.last_insert_rowid();
 
diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs
index cfb342674..aec2c5ad2 100644
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -477,11 +477,7 @@ paramsv![]
         sql.execute_migration("UPDATE chats SET archived=1 WHERE blocked=2;", 78)
             .await?;
     }
-    if dbversion < 79 {
-        info!(context, "[migration] v79");
-        sql.execute_migration("ALTER TABLE msgs ADD COLUMN hop_info TEXT DEFAULT '';", 79)
-            .await?;
-    }
+    
     if dbversion < 79 {
         info!(context, "[migration] v79");
         sql.execute_migration(
@@ -492,7 +488,11 @@ paramsv![]
         )
         .await?;
     }
-
+    if dbversion < 80 {
+        info!(context, "[migration] v80");
+        sql.execute_migration("ALTER TABLE msgs ADD COLUMN hop_info TEXT DEFAULT '';", 80)
+            .await?;
+    }
     Ok((
         recalc_fingerprints,
         update_icons,