diff --git a/ext/custom-addons/dp_custom/__openerp__.py b/ext/custom-addons/dp_custom/__openerp__.py
index fac956c3..5a2657d0 100644
--- a/ext/custom-addons/dp_custom/__openerp__.py
+++ b/ext/custom-addons/dp_custom/__openerp__.py
@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-<<<<<<< HEAD:ext/custom-addons/cam_custom/__openerp__.py
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 20014-2016 datenpol gmbh (<http://www.datenpol.at/>).
-=======
 #    datenpol gmbh
 #    Copyright (C) 2013-TODAY datenpol gmbh(<http://www.datenpol.at>)
->>>>>>> 10.0:ext/custom-addons/dp_custom/__openerp__.py
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/setup/lib/environments.py b/setup/lib/environments.py
index 57534db1..97575844 100644
--- a/setup/lib/environments.py
+++ b/setup/lib/environments.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 class Environment():
-    def __init__(self, host, port, dbname, username, pwd=None, super_admin_pw=None, basic_auth=None):
+    def __init__(self, host, port, dbname, username, pwd=None, super_admin_pw=None, demo=False):
         self.host = host
         self.port = port
         self.dbname = dbname
@@ -11,8 +11,7 @@ class Environment():
         # otherwise it's used to authenticate during login.
         self.pwd = pwd
         self.super_admin_pw = super_admin_pw
-        # HTTP authentication
-        self.basic_auth = basic_auth or ('user', 'pass')
+        self.demo = demo
 
     def __str__(self):
         return """==============================
diff --git a/setup/puppet/modules/odoo/manifests/init.pp b/setup/puppet/modules/odoo/manifests/init.pp
index 82d2a8fa..40075404 100644
--- a/setup/puppet/modules/odoo/manifests/init.pp
+++ b/setup/puppet/modules/odoo/manifests/init.pp
@@ -135,6 +135,7 @@ class odoo {
               'gdata',
               'requests',
               'vatnumber',
+              'xlsxwriter',
               ]:
         ensure   => installed,
         provider => 'pip',