merge conflict resolution.

- logs user in on sign up.