user login and registration
fix conflicts