added login activity
resolved conflicts