login is working. need to fix action
fixing merge conflicts