needless changes
fixed merge issue
login/logout working