Fixed menu and merge issue