thus far
resolve conflict
sign up and login