add category manager
fix conflict