Merge "add login and register" into main