create signup page
finish conflicts