diff --git a/mis_builder/__openerp__.py b/mis_builder/__openerp__.py
index 7d821bc6..f57cb253 100644
--- a/mis_builder/__openerp__.py
+++ b/mis_builder/__openerp__.py
@@ -29,9 +29,14 @@
     'summary': """
         Build 'Management Information System' Reports and Dashboards
     """,
+<<<<<<< HEAD
     'description': """
     """,
     'author': 'ACSONE SA/NV',
+=======
+    'author': 'ACSONE SA/NV,'
+              'Odoo Community Association (OCA)',
+>>>>>>> 98a321c... [FIX] Add OCA as author
     'website': 'http://acsone.eu',
     'depends': [
         'account',
diff --git a/mis_builder_demo/__openerp__.py b/mis_builder_demo/__openerp__.py
index 65a47280..74c412b3 100644
--- a/mis_builder_demo/__openerp__.py
+++ b/mis_builder_demo/__openerp__.py
@@ -29,7 +29,8 @@
     'summary': """
         Demo data for the mis_builder module
     """,
-    'author': 'ACSONE SA/NV',
+    'author': 'ACSONE SA/NV,'
+              'Odoo Community Association (OCA)',
     'website': 'http://acsone.eu',
     'depends': [
         'account_accountant',