make user roles as a separate model
Merge conflicts