finishes authorization, delets develop branch due to merge conflict and merge into master