House cleaning and Added admin User
Routes - conflict resolution