add project category
fix conflict