users and categories
fixed merge conflict