Fix another portion of git conflicts
Merge branch 'implement-auth-screen'