login activity
have conflict
resolve the conflict