gnome-menus: fix file conflicts