diff --git a/odex25_accounting/report_e_invoice/models/account_move.py b/odex25_accounting/report_e_invoice/models/account_move.py
index e16c7762a..ba3a0ec4f 100644
--- a/odex25_accounting/report_e_invoice/models/account_move.py
+++ b/odex25_accounting/report_e_invoice/models/account_move.py
@@ -38,10 +38,6 @@ class AccountMove(models.Model):
             company_name_length_encoding = len(company_name_byte_array).to_bytes(length=1, byteorder='big')
             return company_name_tag_encoding + company_name_length_encoding + company_name_byte_array
 
-<<<<<<< Updated upstream
-        self.qr_string = ''
-=======
->>>>>>> Stashed changes
         for record in self:
             record.qr_string = ''
             qr_code_str = ''