Conflict resolved
- hasRole('admin') replaced with isAdmin()
- Bugs fixed