update
update loginActivity
fix merge