fixing conflicts
fixing conflicts
first version of menus