fixing menu selection
fixing merge