login and register
merge conflicts