Cherry pick of 31ff78f failed

stdout:

stderr:
20:34:09.374824 git.c:444               trace: built-in: git cherry-pick 31ff78f
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
status:

account_payment_group_financial_surcharge/models/account_payment_group.py

@@ -19,7 +19,13 @@ def _computed_financing_surcharge(self):
             rec.financing_surcharge = sum(rec.payment_ids.filtered('installment_id').mapped(lambda x: x.amount - x.net_amount))
 
     def post(self):
+<<<<<<< HEAD
         if self.financing_surcharge:
+||||||| parent of 7dc53e14 (temp)
+        if self.payment_ids.mapped('financing_plan_id'):
+=======
+        if self.filtered(lambda p: p.financing_surcharge > 0):
+>>>>>>> 7dc53e14 (temp)
             product = self.company_id.product_surcharge_id
             if not product:
                 raise UserError(
@@ -41,7 +47,7 @@ def post(self):
             else:
                 journal = self.env['account.journal'].search([('type', '=', 'sale'), ('company_id', '=', self.company_id.id)], limit=1)
                 wiz = self.env['account.payment.group.invoice.wizard'].with_context(
-                    active_id=self.id, internal_type='debit_note').create({
+                    is_automatic_subcharge=True, active_id=self.id, internal_type='debit_note').create({
                         'journal_id': journal.id,
                         'product_id': product.id,
                         'tax_ids': [(6, 0, taxes.ids)],