changed selection menu
fixed merge conflict