merged conflicts and fixed specs for role controller