diff --git a/account_payment_group/models/account_payment_group.py b/account_payment_group/models/account_payment_group.py
index e1e51af33..266f388b7 100644
--- a/account_payment_group/models/account_payment_group.py
+++ b/account_payment_group/models/account_payment_group.py
@@ -319,8 +319,16 @@ def _compute_matched_move_line_ids(self):
         al revz (debit_move_id vs credit_move_id)
         """
         for rec in self:
+<<<<<<< HEAD
             payment_lines = rec.payment_ids.mapped('line_ids').filtered(lambda x: x.account_internal_type in ['receivable', 'payable'])
             rec.matched_move_line_ids = (payment_lines.mapped('matched_debit_ids.debit_move_id') | payment_lines.mapped('matched_credit_ids.credit_move_id')) - payment_lines
+||||||| parent of 35ceee8a... temp
+            payment_lines = rec.payment_ids.mapped('move_line_ids').filtered(lambda x: x.account_internal_type in ['receivable', 'payable'])
+            rec.matched_move_line_ids =  (payment_lines.mapped('matched_debit_ids.debit_move_id') | payment_lines.mapped('matched_credit_ids.credit_move_id')) - payment_lines
+=======
+            payment_lines = rec.payment_ids.mapped('move_line_ids').filtered(lambda x: x.account_internal_type in ['receivable', 'payable'])
+            rec.matched_move_line_ids =  (payment_lines.mapped('matched_debit_ids.debit_move_id').sorted(key=lambda x: x.date_maturity) | payment_lines.mapped('matched_credit_ids.credit_move_id')).sorted(key=lambda x: x.date_maturity) - payment_lines
+>>>>>>> 35ceee8a... temp
 
     @api.depends('payment_ids.line_ids')
     def _compute_move_lines(self):