merge, add register and login
fix