create roles
update sidebar
update views for different roles
resolve merge conflicts