add user login/ sessions
fixed non-conflicts