diff --git a/mis_builder/report/__init__.py b/mis_builder/report/__init__.py
index 4a6549d5..e948be91 100644
--- a/mis_builder/report/__init__.py
+++ b/mis_builder/report/__init__.py
@@ -22,4 +22,13 @@
 #
 ##############################################################################
 
+<<<<<<< HEAD
 from . import mis_builder_xls
+=======
+try:
+    from . import mis_builder_xls
+except ImportError:
+    pass  # this module is not installed
+
+from . import report_mis_report_instance
+>>>>>>> 586ddbe... import guard for report_xls