added categories and partial resources
fix conflict