login works
fixed merge conflicts