resolving conflict with login