diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index fb8c93c..89bfba8 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -74,7 +74,6 @@ function seven_preprocess_page(&$variables) {
 }
 
 /**
-<<<<<<< HEAD
  * Overrides theme_menu_local_tasks().
  *
  * Returns HTML for primary and secondary local tasks.
@@ -151,10 +150,7 @@ function seven_menu_local_task($variables) {
 }
 
 /**
- * Displays the list of available node types for node creation.
-=======
  * Implements hook_preprocess_HOOK() for list of available node type templates.
->>>>>>> applying old patch
  */
 function seven_preprocess_node_add_list(&$variables) {
   if (!empty($variables['content'])) {