Fixed problem quick menu
Fixed merge conflict