added category and language resources
fixed merge conflict
deleted yaml files
fixed model associations