diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php
index 808bc8a..a745c6d 100644
--- a/themes/zuitedesk/template.php
+++ b/themes/zuitedesk/template.php
@@ -256,11 +256,17 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
     }
   }
 
+<<<<<<< HEAD
   // Guided tour for authenticated users:
   if (user_is_logged_in()) {
     $tour = 'tourmenu';
     drupal_add_js(drupal_get_path('theme', 'zuitedesk') . "/js/$tour.js", 'theme', 'footer', FALSE);
   }
+=======
+  // Guided tour:
+  $tour = 'tourmenu';
+  drupal_add_js(drupal_get_path('theme', 'zuitedesk') . "/js/$tour.js", 'theme', 'footer', FALSE);
+>>>>>>> f036f960cad6e57914f725e563b60bca5738540a
 }
 
 function _zuitedesk_option($access, $url, $text, $id = NULL, $icon = NULL, $message = NULL) {
diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info
index 35881d3..5d00658 100644
--- a/themes/zuitedesk/zuitedesk.info
+++ b/themes/zuitedesk/zuitedesk.info
@@ -1,6 +1,10 @@
 name        = SuiteDesk Theme
 description = SuiteDesk Theme Zen.
+<<<<<<< HEAD
 version     = 0.2.46
+=======
+version     = 0.2.45
+>>>>>>> f036f960cad6e57914f725e563b60bca5738540a
 
 screenshot = screenshot.png