Fixes merge conflict
Fixes merge conflict
Removed localizations
Adds sign in