maintaining session, and signup
resolving conflict