diff --git a/includes/context.inc b/includes/context.inc
index 76c1cefdba01f46e2ddb5038e219d1dcef4a2cd1..fe3edac63db42fea54151cf4b8f4f2d107e1b552 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -611,23 +611,6 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts) {
       // Figure out our keyword and converter, if specified.
       if (strpos($keyword, ':')) {
         list($context, $converter) = explode(':', $keyword);
-<<<<<<< HEAD
-        if (empty($context->empty) && isset($context_keywords[$context])) {
-          $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter);
-        }
-        else {
-          $keywords['%' . $keyword] = '';
-        }
-      }
-      else {
-        if (isset($context_keywords[$keyword])) {
-          if (empty($context_keywords[$keyword]->empty)) {
-            $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
-          }
-          else {
-            $keywords['%' . $keyword] = '';
-          }
-=======
       }
       else {
         $context = $keyword;
@@ -636,7 +619,6 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts) {
         // Fall back to a default converter, if specified.
         if ($plugin && !empty($plugin['convert default'])) {
           $converter = $plugin['convert default'];
->>>>>>> DRUPAL-6--1
         }
       }
 
diff --git a/js/ajax-responder.js b/js/ajax-responder.js
index 2ae87fa675fc905aa9ec16ee0534e7fc8c438b96..f427e3da07b48fec3c10854a831d53721a10d01a 100644
--- a/js/ajax-responder.js
+++ b/js/ajax-responder.js
@@ -129,7 +129,6 @@
       $('.ctools-ajaxing').removeClass('ctools-ajaxing');
       return false;
     }
->>>>>>> DRUPAL-6--1
 
     return false;
   };
diff --git a/plugins/content_types/search/search_result.inc b/plugins/content_types/search/search_result.inc
index 7d8c551bc0c7a000634e07c250618a8f7f433a69..4c83350984f17cd55e0926a329e3839ae116a0b9 100644
--- a/plugins/content_types/search/search_result.inc
+++ b/plugins/content_types/search/search_result.inc
@@ -86,12 +86,9 @@ function ctools_search_result_content_type_render($subtype, $conf, $panel_args,
 function ctools_search_result_content_type_edit_form(&$form, &$form_state) {
   $conf = $form_state['conf'];
 
-<<<<<<< HEAD
-=======
   // Add js for collapsible fieldsets manually
   drupal_add_js('misc/collapse.js');
 
->>>>>>> DRUPAL-6--1
   $types = array();
   foreach (module_implements('search') as $name) {
     $types[$name] = module_invoke($name, 'search', 'name', TRUE);