dashboard in menu
conflict resolved