Removed the unresolved version-control conflict markers from create_icon_menu and kept the custom_alt_fallback_icon declaration intact so the later fallback icon assignments remain valid for compilation.

src/fe-gtk/menu.c

@@ -2135,10 +2135,7 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
 	const char *theme_variant = "light";
 	char *resource_path;
 	const char *custom_fallback_icon = NULL;
-<<<<<<< ours
-=======
 	const char *custom_alt_fallback_icon = NULL;
->>>>>>> theirs
 	GdkPixbuf *custom_pixbuf = NULL;
 #endif
 #if !HAVE_GTK3