login screen
Conflict corrections
AndroidManifest.xml corrections