cleaned up user login
fix merge conflict