diff --git a/connector_woocommerce/__manifest__.py b/connector_woocommerce/__manifest__.py
index 4794eb8..0e0c639 100644
--- a/connector_woocommerce/__manifest__.py
+++ b/connector_woocommerce/__manifest__.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # © 2009 Tech-Receptives Solutions Pvt. Ltd.
 # © 2018 Serpent Consulting Services Pvt. Ltd.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
diff --git a/connector_woocommerce/__openerp__.py b/connector_woocommerce/__openerp__.py
deleted file mode 100644
index 0f48c43..0000000
--- a/connector_woocommerce/__openerp__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#
-#    Tech-Receptives Solutions Pvt. Ltd.
-#    Copyright (C) 2009-TODAY Tech-Receptives(<http://www.techreceptives.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-{
-    'name': 'WooCommerce Connector',
-    'version': '8.0.1.0.1',
-    'category': 'customized',
-    'description': """WooCommerce Connector.""",
-    'author': 'Tech Receptives',
-    'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base', 'connector', 'connector_ecommerce'],
-    'installable': False,
-    'auto_install': False,
-    'data': [
-        "security/ir.model.access.csv",
-        "views/backend_view.xml",
-    ],
-    'external_dependencies': {
-        'python': ['woocommerce'],
-    },
-    'js': [],
-    'application': True,
-    "sequence": 3,
-}