add category menu
fix conflict