make the sign-in link go to sign-up page
file cleanup
resolve merge conflicts