diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 5fe60230..b84a1875 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -12755,17 +12755,16 @@ Buerklin-API Authentication server:
         <target>Create [part] from barcode</target>
       </segment>
     </unit>
-<<<<<<< HEAD
     <unit id="xH258F." name="parts.create_from_scan.title">
       <segment state="translated">
         <source>parts.create_from_scan.title</source>
         <target>Create [part] from label scan</target>
-=======
+      </segment>
+    </unit>
     <unit id="8WZYwRJ" name="scan_dialog.mode.amazon">
       <segment state="translated">
         <source>scan_dialog.mode.amazon</source>
         <target>Amazon barcode</target>
->>>>>>> 0b9b2cbf (Allow to read amazon labels for part retrieval and creation)
       </segment>
     </unit>
     <unit id="BQWuR_G" name="settings.ips.canopy">