User service
Auth service
Auth & User services dependence
Test controller
resolved conflicts