begin modal login
fixed merge conflicts