signup works
merge conflicts solved