Resolved conflicts
Conflict resolved for routes
Roles added