diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index e8a16a1f3..fb7c0ec1e 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1076,7 +1076,7 @@ INSERT INTO msgs
     ?, ?, ?, ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?,
-    ?, ?
+    ?, ?, ?
   );
 "#,
         )?;
@@ -1156,19 +1156,12 @@ INSERT INTO msgs
             part.error.take().unwrap_or_default(),
             ephemeral_timer,
             ephemeral_timestamp,
-<<<<<<< HEAD
-<<<<<<< HEAD
             if is_partial_download.is_some() {
                 DownloadState::Available
             } else {
                 DownloadState::Done
             },
-=======
             mime_parser.hop_info
->>>>>>> 4fa0edcf (add hop info)
-=======
-            mime_parser.hop_info
->>>>>>> 3f8878fe7a756257dc6170712bc034d5b411ec3d
         ])?;
         let row_id = conn.last_insert_rowid();
 
diff --git a/src/mimeparser.rs b/src/mimeparser.rs
index 67028be1e..a5077a067 100644
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -287,7 +287,6 @@ impl MimeMessage {
             footer: None,
             is_mime_modified: false,
             decoded_data: Vec::new(),
-
             hop_info: parse_receive_headers(&mail.get_headers()),
         };