Added User management
resolved conflict