Progress on LoginActivity
Fix merge conflict