diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index e5c307dc3b..b35f766ea4 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -1926,7 +1926,6 @@ void menu_populate_entries(void *data, unsigned menu_type)
             file_list_push(rgui->selection_buf, "No options available.", RGUI_SETTINGS_CORE_OPTION_NONE, 0);
          break;		 
       case RGUI_SETTINGS_CORE_INFO:
-<<<<<<< HEAD
          file_list_clear(rgui->selection_buf);
          if (rgui->core_info_current.data)
          {