Signin Activity
Merge Conflict solved