login and register
merge conflits