fixing conflict
Merge branch 'auth'