add add category
fix conflict