more registration + sign in implementation
merge conflict