diff --git a/__init__.py b/__init__.py
index e5573d4..8a49cb1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,11 +13,8 @@ def register():
         purchase.PurchaseLine,
         sale.Sale,
         sale.SaleLine,
-<<<<<<< HEAD
         invoice.Invoice,
         invoice.InvoiceLine,
-=======
->>>>>>> 1285df0ffd85147b613805dd27362ce123755f35
         module='analytic_operations', type_='model')
     Pool.register(
         module='analytic_operations', type_='wizard')