register and login Done
Merge