home page things
resolved conflict signup