diff --git a/olives.theme b/olives.theme
index 89f3518..b116fa9 100755
--- a/olives.theme
+++ b/olives.theme
@@ -46,23 +46,6 @@ function olives_preprocess_html(&$variables) {
   ];
 }
 
-<<<<<<< HEAD
-function olives_preprocess_mirador(&$variables) {
-//  $variables['window_config']['allowClose'] = FALSE;
-  $variables['window_config']['allowClose'] = FALSE;
-  $variables['window_config']['selectedTheme'] = 'dark';
-//$variables['window_config']['config']['selectedTheme'] = 'dark';
- // $variables['window_config']['selectedTheme'] = 'dark';
-  //$window_config['sideBarOpen'] = TRUE;
-  //$variables['selectedTheme'] = 'dark';
-  //$variables['#attached']['drupalSettings']['mirador']['window_settings']['selectedTheme'] = 'dark';
-  //$variables['#attached']['drupalSettings']['mirador_window_settings']['imageToolsEnabled'] = FALSE;
-  //$variables['#attached']['drupalSettings']['mirador_window_settings']['imageToolsOpen'] = FALSE;
-//$configuration['window_config']['selectedTheme'] = 'dark';
-//	dpm();
-}
-=======
->>>>>>> d23cdae9c0cf6f7cc3c03c8e54482c16b062f7d0
 
 /**
  * Implements hook_preprocess_HOOK() for page title templates.
@@ -715,25 +698,3 @@ function _olives_hex_to_hsl(string $hex_string) {
   return [$h, $s, $l];
 }
 
-<<<<<<< HEAD
-
-=======
-function olives_preprocess_mirador(&$variables) {
-  $variables['window_config']['allowClose'] = TRUE;
-  $variables['thumbnail_navigation_position'] = 'far-right';
-/*
-  $variables['window_config']['panels']['info'] = FALSE;
-  $variables['window_config']['panels']['attribution'] = FALSE;
-  $variables['window_config']['panels']['canvas'] = FALSE;
-  $variables['window_config']['panels']['annotations'] = FALSE;
-  $variables['window_config']['panels']['layers'] = FALSE;
-
-  $variables['window_config']['imageToolsEnabled'] = FALSE;
-  $variables['window_config']['imageToolsOpen'] = FALSE;
-  $variables['window_config']['textOverlay']['selectable'] = FALSE;
-
-  $variables['window_config']['selectedTheme'] = 'dark';
-*/
-//dump($variables);
-}
->>>>>>> d23cdae9c0cf6f7cc3c03c8e54482c16b062f7d0