diff --git a/account_credit_control/__init__.py b/account_credit_control/__init__.py
index 4da4c748d..b233d1220 100644
--- a/account_credit_control/__init__.py
+++ b/account_credit_control/__init__.py
@@ -1,8 +1,14 @@
+<<<<<<< 3bb811bb84ec5c265d8e9245eff93a4a5f98059f
 <<<<<<< f4a71683cf11965d8ffc1f5016e254fe6aa2eaf5
 # -*- coding: utf-8 -*-
 # Copyright 2017 Okia SPRL (https://okia.be)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 =======
 >>>>>>> Fix errors, improve menus, views, readme
+=======
+# -*- coding: utf-8 -*-
+# Copyright 2017 Okia SPRL (https://okia.be)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+>>>>>>> Add some unit tests on the module account_credit_control
 from . import models
 from . import wizard
diff --git a/account_credit_control/models/__init__.py b/account_credit_control/models/__init__.py
index d43188956..4f36aa6a3 100644
--- a/account_credit_control/models/__init__.py
+++ b/account_credit_control/models/__init__.py
@@ -1,9 +1,15 @@
+<<<<<<< 3bb811bb84ec5c265d8e9245eff93a4a5f98059f
 <<<<<<< f4a71683cf11965d8ffc1f5016e254fe6aa2eaf5
 # -*- coding: utf-8 -*-
 # Copyright 2017 Okia SPRL (https://okia.be)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 =======
 >>>>>>> Fix errors, improve menus, views, readme
+=======
+# -*- coding: utf-8 -*-
+# Copyright 2017 Okia SPRL (https://okia.be)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+>>>>>>> Add some unit tests on the module account_credit_control
 from . import account_account
 from . import account_invoice
 from . import credit_control_line
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 7991ff6b7..7a2b65d5d 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -82,10 +82,13 @@ class CreditControlPolicyChanger(models.TransientModel):
     @api.model
     def _set_invoice_policy(self, move_lines, policy):
         """ Force policy on invoice """
+<<<<<<< 3bb811bb84ec5c265d8e9245eff93a4a5f98059f
 <<<<<<< f4a71683cf11965d8ffc1f5016e254fe6aa2eaf5
 =======
         invoice_obj = self.env['account.invoice']
 >>>>>>> Fix errors, improve menus, views, readme
+=======
+>>>>>>> Add some unit tests on the module account_credit_control
         invoices = move_lines.mapped('invoice_id')
         invoices.write({'credit_policy_id': policy.id})