Fixed bug in auth request
Resolved conflicts
git staahhhhp